diff options
author | Ronald Oussoren <ronaldoussoren@mac.com> | 2010-02-11 13:27:59 +0000 |
---|---|---|
committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2010-02-11 13:27:59 +0000 |
commit | e27d9b62907da46fa3156c1dafc9cdcb86a62ce4 (patch) | |
tree | dbf944a89c971458f13638930adbca7550a762e4 /configure | |
parent | 7514efa95231bc900f7f98070f3b7b5bfbe1aba0 (diff) | |
download | cpython-e27d9b62907da46fa3156c1dafc9cdcb86a62ce4.tar.gz |
Merged revisions 78154 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r78154 | ronald.oussoren | 2010-02-11 14:26:54 +0100 (Thu, 11 Feb 2010) | 2 lines
Finish fix for issue 7715, after explicit search for calls to `arch`
........
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 78069 . +# From configure.in Revision: 78151 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for python 2.6. # @@ -4747,7 +4747,7 @@ echo "$as_me: error: proper usage is --with-universal-arch=32-bit|64-bit|all|int 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. @@ -12989,7 +12989,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)';; @@ -13057,7 +13057,7 @@ fi if test "${ac_osx_32bit}" = "yes"; then - case `arch` in + case `/usr/bin/arch` in i386) MACOSX_DEFAULT_ARCH="i386" ;; @@ -13071,7 +13071,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" ;; |