]> granicus.if.org Git - python/commitdiff
Finish fix for issue 7715, after explicit search for calls to `arch`
authorRonald Oussoren <ronaldoussoren@mac.com>
Thu, 11 Feb 2010 13:26:54 +0000 (13:26 +0000)
committerRonald Oussoren <ronaldoussoren@mac.com>
Thu, 11 Feb 2010 13:26:54 +0000 (13:26 +0000)
configure
configure.in

index 2870e31662078f9c7383cedd42b43906a32cd4db..7f99de8c58e2a14b193e3ecd55dfa5a67601d955 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 77588 .
+# From configure.in Revision: 78150 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for python 2.7.
 #
@@ -4748,7 +4748,7 @@ echo "${ECHO_T}$CC" >&6; }
                                    cur_target='10.5'
                            fi
                    else
-                           if test `arch` = "i386"; then
+                           if test `/usr/bin/arch` = "i386"; then
                                    # On Intel macs default to a deployment
                                    # target of 10.4, that's the first OSX
                                    # release with Intel support.
@@ -14579,7 +14579,7 @@ case $ac_sys_system/$ac_sys_release in
     if test "${enable_universalsdk}"; then
            :
     else
-        LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only `arch`"
+        LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only `/usr/bin/arch`"
     fi
     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
@@ -14647,7 +14647,7 @@ fi
 
 
     if test "${ac_osx_32bit}" = "yes"; then
-       case `arch` in
+       case `/usr/bin/arch` in
        i386)
                MACOSX_DEFAULT_ARCH="i386"
                ;;
@@ -14661,7 +14661,7 @@ echo "$as_me: error: Unexpected output of 'arch' on OSX" >&2;}
                ;;
        esac
     else
-       case `arch` in
+       case `/usr/bin/arch` in
        i386)
                MACOSX_DEFAULT_ARCH="x86_64"
                ;;
index 6f317c87bfbc8276c5df19df4800538327952db5..84a6d9cacc89b4b28776040f1c435e9a2330eef7 100644 (file)
@@ -991,7 +991,7 @@ yes)
                                    cur_target='10.5'
                            fi
                    else
-                           if test `arch` = "i386"; then
+                           if test `/usr/bin/arch` = "i386"; then
                                    # On Intel macs default to a deployment
                                    # target of 10.4, that's the first OSX
                                    # release with Intel support.
@@ -1615,7 +1615,7 @@ case $ac_sys_system/$ac_sys_release in
     if test "${enable_universalsdk}"; then
            :
     else
-        LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only `arch`"
+        LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only `/usr/bin/arch`"
     fi
     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
@@ -1642,7 +1642,7 @@ case $ac_sys_system/$ac_sys_release in
        ac_osx_32bit=yes)
     
     if test "${ac_osx_32bit}" = "yes"; then
-       case `arch` in
+       case `/usr/bin/arch` in
        i386) 
                MACOSX_DEFAULT_ARCH="i386" 
                ;;
@@ -1654,7 +1654,7 @@ case $ac_sys_system/$ac_sys_release in
                ;;
        esac
     else
-       case `arch` in
+       case `/usr/bin/arch` in
        i386) 
                MACOSX_DEFAULT_ARCH="x86_64" 
                ;;