mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merged revisions 78156 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r78156 | ronald.oussoren | 2010-02-11 14:38:58 +0100 (Thu, 11 Feb 2010) | 9 lines

  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`
  ........
................
This commit is contained in:
Ronald Oussoren 2010-02-11 13:40:06 +00:00
parent c8c89c4e62
commit 175a88458e
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
configure vendored
View file

@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.in Revision: 78074 . # From configure.in Revision: 78153 .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for python 3.1. # Generated by GNU Autoconf 2.61 for python 3.1.
# #
@ -4703,7 +4703,7 @@ echo "$as_me: error: proper usage is --with-universal-arch=32-bit|64-bit|all|int
cur_target='10.5' cur_target='10.5'
fi fi
else else
if test `arch` = "i386"; then if test `/usr/bin/arch` = "i386"; then
# On Intel macs default to a deployment # On Intel macs default to a deployment
# target of 10.4, that's the first OSX # target of 10.4, that's the first OSX
# release with Intel support. # release with Intel support.
@ -13292,7 +13292,7 @@ case $ac_sys_system/$ac_sys_release in
if test "${enable_universalsdk}"; then if test "${enable_universalsdk}"; then
: :
else else
LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only `arch`" LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only `/usr/bin/arch`"
fi fi
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)' LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';; LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
@ -13360,7 +13360,7 @@ fi
if test "${ac_osx_32bit}" = "yes"; then if test "${ac_osx_32bit}" = "yes"; then
case `arch` in case `/usr/bin/arch` in
i386) i386)
MACOSX_DEFAULT_ARCH="i386" MACOSX_DEFAULT_ARCH="i386"
;; ;;
@ -13374,7 +13374,7 @@ echo "$as_me: error: Unexpected output of 'arch' on OSX" >&2;}
;; ;;
esac esac
else else
case `arch` in case `/usr/bin/arch` in
i386) i386)
MACOSX_DEFAULT_ARCH="x86_64" MACOSX_DEFAULT_ARCH="x86_64"
;; ;;

8
configure.in
View file

@ -958,7 +958,7 @@ yes)
cur_target='10.5' cur_target='10.5'
fi fi
else else
if test `arch` = "i386"; then if test `/usr/bin/arch` = "i386"; then
# On Intel macs default to a deployment # On Intel macs default to a deployment
# target of 10.4, that's the first OSX # target of 10.4, that's the first OSX
# release with Intel support. # release with Intel support.
@ -1526,7 +1526,7 @@ case $ac_sys_system/$ac_sys_release in
if test "${enable_universalsdk}"; then if test "${enable_universalsdk}"; then
: :
else else
LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only `arch`" LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only `/usr/bin/arch`"
fi fi
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)' LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';; LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
@ -1553,7 +1553,7 @@ case $ac_sys_system/$ac_sys_release in
ac_osx_32bit=yes) ac_osx_32bit=yes)
if test "${ac_osx_32bit}" = "yes"; then if test "${ac_osx_32bit}" = "yes"; then
case `arch` in case `/usr/bin/arch` in
i386) i386)
MACOSX_DEFAULT_ARCH="i386" MACOSX_DEFAULT_ARCH="i386"
;; ;;
@ -1565,7 +1565,7 @@ case $ac_sys_system/$ac_sys_release in
;; ;;
esac esac
else else
case `arch` in case `/usr/bin/arch` in
i386) i386)
MACOSX_DEFAULT_ARCH="x86_64" MACOSX_DEFAULT_ARCH="x86_64"
;; ;;