Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit e3da75a

Browse files
ronaldoussorenronaldoussoren
committed
Merged revisions 78154 via svnmerge from
svn+ssh://[email protected]/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` ........
1 parent 564f7f2 commit e3da75a

2 files changed

Lines changed: 9 additions & 9 deletions

File tree

‎configure‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#! /bin/sh
2-
# From configure.in Revision: 78095 .
2+
# From configure.in Revision: 78152 .
33
# Guess values for system-dependent variables and create Makefiles.
44
# Generated by GNU Autoconf 2.61 for python 3.2.
55
#
@@ -4730,7 +4730,7 @@ echo "$as_me: error: proper usage is --with-universal-arch=32-bit|64-bit|all|int
47304730
cur_target='10.5'
47314731
fi
47324732
else
4733-
if test `arch` = "i386"; then
4733+
if test `/usr/bin/arch` = "i386"; then
47344734
# On Intel macs default to a deployment
47354735
# target of 10.4, that's the first OSX
47364736
# release with Intel support.
@@ -14449,7 +14449,7 @@ case $ac_sys_system/$ac_sys_release in
1444914449
if test "${enable_universalsdk}"; then
1445014450
:
1445114451
else
14452-
LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only `arch`"
14452+
LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only `/usr/bin/arch`"
1445314453
fi
1445414454
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
1445514455
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
@@ -14517,7 +14517,7 @@ fi
1451714517

1451814518

1451914519
if test "${ac_osx_32bit}" = "yes"; then
14520-
case `arch` in
14520+
case `/usr/bin/arch` in
1452114521
i386)
1452214522
MACOSX_DEFAULT_ARCH="i386"
1452314523
;;
@@ -14531,7 +14531,7 @@ echo "$as_me: error: Unexpected output of 'arch' on OSX" >&2;}
1453114531
;;
1453214532
esac
1453314533
else
14534-
case `arch` in
14534+
case `/usr/bin/arch` in
1453514535
i386)
1453614536
MACOSX_DEFAULT_ARCH="x86_64"
1453714537
;;

‎configure.in‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -982,7 +982,7 @@ EOF
982982
cur_target='10.5'
983983
fi
984984
else
985-
if test `arch` = "i386"; then
985+
if test `/usr/bin/arch` = "i386"; then
986986
# On Intel macs default to a deployment
987987
# target of 10.4, that's the first OSX
988988
# release with Intel support.
@@ -1508,7 +1508,7 @@ case $ac_sys_system/$ac_sys_release in
15081508
if test "${enable_universalsdk}"; then
15091509
:
15101510
else
1511-
LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only `arch`"
1511+
LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only `/usr/bin/arch`"
15121512
fi
15131513
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
15141514
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
@@ -1535,7 +1535,7 @@ case $ac_sys_system/$ac_sys_release in
15351535
ac_osx_32bit=yes)
15361536

15371537
if test "${ac_osx_32bit}" = "yes"; then
1538-
case `arch` in
1538+
case `/usr/bin/arch` in
15391539
i386)
15401540
MACOSX_DEFAULT_ARCH="i386"
15411541
;;
@@ -1547,7 +1547,7 @@ case $ac_sys_system/$ac_sys_release in
15471547
;;
15481548
esac
15491549
else
1550-
case `arch` in
1550+
case `/usr/bin/arch` in
15511551
i386)
15521552
MACOSX_DEFAULT_ARCH="x86_64"
15531553
;;

0 commit comments

Comments
 (0)