diff --git a/plugins/python-build/bin/python-build b/plugins/python-build/bin/python-build index c1910a2f..005326cc 100755 --- a/plugins/python-build/bin/python-build +++ b/plugins/python-build/bin/python-build @@ -1815,10 +1815,12 @@ fi # Set MACOSX_DEPLOYMENT_TARGET from the product version of OS X (#219, #220) if [[ "Darwin" == "$(uname -s)" ]]; then - MACOS_VERSION="$(sw_vers -productVersion 2>/dev/null || true)" - MACOS_VERSION_ARRAY=(${MACOS_VERSION//\./ }) - if [ "${#MACOS_VERSION_ARRAY[@]}" -ge 2 ]; then - export MACOSX_DEPLOYMENT_TARGET="${MACOS_VERSION_ARRAY[0]}.${MACOS_VERSION_ARRAY[1]}" + if [ -z "${MACOSX_DEPLOYMENT_TARGET}" ]; then + MACOS_VERSION="$(sw_vers -productVersion 2>/dev/null || true)" + MACOS_VERSION_ARRAY=(${MACOS_VERSION//\./ }) + if [ "${#MACOS_VERSION_ARRAY[@]}" -ge 2 ]; then + export MACOSX_DEPLOYMENT_TARGET="${MACOS_VERSION_ARRAY[0]}.${MACOS_VERSION_ARRAY[1]}" + fi fi fi diff --git a/plugins/python-build/test/pyenv_ext.bats b/plugins/python-build/test/pyenv_ext.bats index fe862d67..ec3395d2 100644 --- a/plugins/python-build/test/pyenv_ext.bats +++ b/plugins/python-build/test/pyenv_ext.bats @@ -259,3 +259,24 @@ OUT PYTHON_CONFIGURE_OPTS_ARRAY=(--enable-universalsdk=/ --with-universal-archs=intel) EOS } + +@test "default MACOSX_DEPLOYMENT_TARGET" { + stub uname '-s : echo Darwin' + stub sw_vers '-productVersion : echo 10.10' + + TMPDIR="$TMP" run_inline_definition <