]> granicus.if.org Git - python/commitdiff
Macosx: this patch ensures that the value of MACOSX_DEPLOYMENT_TARGET used
authorRonald Oussoren <ronaldoussoren@mac.com>
Sun, 2 Sep 2007 09:46:07 +0000 (09:46 +0000)
committerRonald Oussoren <ronaldoussoren@mac.com>
Sun, 2 Sep 2007 09:46:07 +0000 (09:46 +0000)
by the Makefile is also used at configure-time.

configure
configure.in

index 0e1b526c596f1a54572f78dbfd51708eee83b4b7..4518c7d19e18beec04cf4c8255dde1ea6a1b3ce6 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 57279 .
+# From configure.in Revision: 57762 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for python 2.6.
 #
@@ -12033,6 +12033,14 @@ then
                        cur_target=10.3
                fi
                CONFIGURE_MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET-${cur_target}}
+
+               # Make sure that MACOSX_DEPLOYMENT_TARGET is set in the
+               # environment with a value that is the same as what we'll use
+               # in the Makefile to ensure that we'll get the same compiler
+               # environment during configure and build time.
+               MACOSX_DEPLOYMENT_TARGET="$CONFIGURE_MACOSX_DEPLOYMENT_TARGET"
+               export MACOSX_DEPLOYMENT_TARGET
+
                EXPORT_MACOSX_DEPLOYMENT_TARGET=''
                if test ${MACOSX_DEPLOYMENT_TARGET-${cur_target}} '>' 10.2
                then
index ef9601d982eea14eb775027cd9016c5652bc2383..dd8e1177b46d91cb7e8bbdc8af52fc05c58b3ef0 100644 (file)
@@ -1509,6 +1509,14 @@ then
                        cur_target=10.3
                fi
                CONFIGURE_MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET-${cur_target}}
+
+               # Make sure that MACOSX_DEPLOYMENT_TARGET is set in the 
+               # environment with a value that is the same as what we'll use
+               # in the Makefile to ensure that we'll get the same compiler
+               # environment during configure and build time.
+               MACOSX_DEPLOYMENT_TARGET="$CONFIGURE_MACOSX_DEPLOYMENT_TARGET"
+               export MACOSX_DEPLOYMENT_TARGET
+
                EXPORT_MACOSX_DEPLOYMENT_TARGET=''
                if test ${MACOSX_DEPLOYMENT_TARGET-${cur_target}} '>' 10.2
                then