Commit 1a37ab18 by SHIBATA Hiroshi Committed by GitHub

Merge pull request #934 from aycabta/gmake-is-required-for-jruby

GNU Make is always required for JRuby on FreeBSD
parents c3c58cde 750c086d
...@@ -1212,8 +1212,16 @@ if "${CC:-cc}" -x c /dev/null -E -Wno-error=shorten-64-to-32 &>/dev/null; then ...@@ -1212,8 +1212,16 @@ if "${CC:-cc}" -x c /dev/null -E -Wno-error=shorten-64-to-32 &>/dev/null; then
fi fi
if [ -z "$MAKE" ]; then if [ -z "$MAKE" ]; then
if [ "FreeBSD" = "$(uname -s)" ] && [ "$(uname -r | sed 's/[^[:digit:]].*//')" -lt 10 ]; then if [ "FreeBSD" = "$(uname -s)" ]; then
export MAKE="gmake" 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
else else
export MAKE="make" export MAKE="make"
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment