Skip to content

Commit 1a37ab1

Browse files
authored
Merge pull request rbenv#934 from aycabta/gmake-is-required-for-jruby
GNU Make is always required for JRuby on FreeBSD
2 parents c3c58cd + 750c086 commit 1a37ab1

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

bin/ruby-build

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1212,8 +1212,16 @@ if "${CC:-cc}" -x c /dev/null -E -Wno-error=shorten-64-to-32 &>/dev/null; then
12121212
fi
12131213

12141214
if [ -z "$MAKE" ]; then
1215-
if [ "FreeBSD" = "$(uname -s)" ] && [ "$(uname -r | sed 's/[^[:digit:]].*//')" -lt 10 ]; then
1216-
export MAKE="gmake"
1215+
if [ "FreeBSD" = "$(uname -s)" ]; then
1216+
if [ $(echo $1 | sed 's/-.*$//') = "jruby" ]; then
1217+
export MAKE="gmake"
1218+
else
1219+
if [ "$(uname -r | sed 's/[^[:digit:]].*//')" -lt 10 ]; then
1220+
export MAKE="gmake"
1221+
else
1222+
export MAKE="make"
1223+
fi
1224+
fi
12171225
else
12181226
export MAKE="make"
12191227
fi

0 commit comments

Comments
 (0)