From 2fa12aa897d3617bc5e93d8fadd42d6fa7a2fbaa Mon Sep 17 00:00:00 2001 From: Koichiro Iwao Date: Wed, 20 Nov 2019 18:11:43 +0900 Subject: [PATCH] Set default MAKE=gmake on FreeBSD again as an workaround for Ruby bug 16331: https://bugs.ruby-lang.org/issues/16331 Due to this bug, build will fail with FreeBSD's make after #1368. The bug is already fixed in MRI upstream but GNU make is still required when building older releases of Ruby. Use GNU make rather than switching make/gmake depending of Ruby version. See also: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=241633 --- bin/ruby-build | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/bin/ruby-build b/bin/ruby-build index a5aa2f89..e2df64af 100755 --- a/bin/ruby-build +++ b/bin/ruby-build @@ -1320,15 +1320,12 @@ fi if [ -z "$MAKE" ]; then if [ "FreeBSD" = "$(uname -s)" ]; then - if [ "$(echo $1 | sed 's/-.*$//')" = "jruby" ]; then - export MAKE="gmake" - else - if [ "$(uname -r | sed 's/[^[:digit:]].*//')" -lt 10 ]; then - export MAKE="gmake" - else - export MAKE="make" - fi - fi + # Workaround for Ruby bug 16331: https://bugs.ruby-lang.org/issues/16331 + # Due to this bug, build will fail with FreeBSD's make after #1368 + # The bug is already fixed in upstream but GNU make is still required + # when building older releases of Ruby. Use GNU make rather than switching + # depending of Ruby version. + export MAKE="gmake" else export MAKE="make" fi