diff options
| author | Ronald Oussoren <ronaldoussoren@mac.com> | 2010-02-11 13:26:54 (GMT) |
|---|---|---|
| committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2010-02-11 13:26:54 (GMT) |
| commit | bc0e83c2b9a0307cd57bf48e9d99897205a86491 (patch) | |
| tree | 35d80ebc4e8d6d68158b12078eee67d569eb2c3d | |
| parent | 9922f178d3d34b2cd2191f21fdfc95e34da8008c (diff) | |
| download | cpython-bc0e83c2b9a0307cd57bf48e9d99897205a86491.zip cpython-bc0e83c2b9a0307cd57bf48e9d99897205a86491.tar.gz cpython-bc0e83c2b9a0307cd57bf48e9d99897205a86491.tar.bz2 | |
Finish fix for issue 7715, after explicit search for calls to `arch`
| -rwxr-xr-x | configure | 10 | ||||
| -rw-r--r-- | configure.in | 8 |
2 files changed, 9 insertions, 9 deletions
@@ -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" ;; diff --git a/configure.in b/configure.in index 6f317c8..84a6d9c 100644 --- a/configure.in +++ b/configure.in @@ -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" ;; |