Import changes from ruby-build v20160602

This commit is contained in:
Yamashita, Yuu 2016-08-15 04:40:09 +00:00
parent 740fbe4bda
commit 3a1379cb34

View file

@ -14,7 +14,7 @@
# -g/--debug Build a debug version # -g/--debug Build a debug version
# #
PYTHON_BUILD_VERSION="20160130" PYTHON_BUILD_VERSION="20160602"
OLDIFS="$IFS" OLDIFS="$IFS"
@ -1831,11 +1831,19 @@ fi
#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
# if [ $(echo $1 | sed 's/-.*$//') = "jruby" ]; then
# export MAKE="gmake"
# else
if [ "$(uname -r | sed 's/[^[:digit:]].*//')" -lt 10 ]; then
export MAKE="gmake" export MAKE="gmake"
else else
export MAKE="make" export MAKE="make"
fi fi
# fi
else
export MAKE="make"
fi
fi fi
if [ -n "$PYTHON_BUILD_CACHE_PATH" ] && [ -d "$PYTHON_BUILD_CACHE_PATH" ]; then if [ -n "$PYTHON_BUILD_CACHE_PATH" ] && [ -d "$PYTHON_BUILD_CACHE_PATH" ]; then