From 3a1379cb3474ada8282108498bb67df14014a509 Mon Sep 17 00:00:00 2001 From: "Yamashita, Yuu" Date: Mon, 15 Aug 2016 04:40:09 +0000 Subject: [PATCH] Import changes from ruby-build v20160602 --- plugins/python-build/bin/python-build | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/plugins/python-build/bin/python-build b/plugins/python-build/bin/python-build index 779a0a5a..e56ff6a8 100755 --- a/plugins/python-build/bin/python-build +++ b/plugins/python-build/bin/python-build @@ -14,7 +14,7 @@ # -g/--debug Build a debug version # -PYTHON_BUILD_VERSION="20160130" +PYTHON_BUILD_VERSION="20160602" OLDIFS="$IFS" @@ -1831,8 +1831,16 @@ fi #fi if [ -z "$MAKE" ]; then - if [ "FreeBSD" = "$(uname -s)" ] && [ "$(uname -r | sed 's/[^[:digit:]].*//')" -lt 10 ]; then - export MAKE="gmake" + 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 else export MAKE="make" fi