summaryrefslogtreecommitdiffstats
path: root/Mac/Tools
diff options
context:
space:
mode:
authorRonald Oussoren <ronaldoussoren@mac.com>2006-06-11 20:24:45 (GMT)
committerRonald Oussoren <ronaldoussoren@mac.com>2006-06-11 20:24:45 (GMT)
commitc55555400eb497ff2eca54947feb40b1fa127190 (patch)
treeb8bfe85df7f34f67fd4acaa09cfb5524b5c3b26e /Mac/Tools
parent4fbb080bc16de9f37a84d517e84bae5dbe12fc8e (diff)
downloadcpython-c55555400eb497ff2eca54947feb40b1fa127190.zip
cpython-c55555400eb497ff2eca54947feb40b1fa127190.tar.gz
cpython-c55555400eb497ff2eca54947feb40b1fa127190.tar.bz2
- Change fixapplepython23.py to ensure that it will run with /usr/bin/python
on intel macs. - Fix some minor problems in the installer for OSX
Diffstat (limited to 'Mac/Tools')
-rw-r--r--Mac/Tools/fixapplepython23.py10
1 files changed, 10 insertions, 0 deletions
diff --git a/Mac/Tools/fixapplepython23.py b/Mac/Tools/fixapplepython23.py
index ef352ce..fb8645a 100644
--- a/Mac/Tools/fixapplepython23.py
+++ b/Mac/Tools/fixapplepython23.py
@@ -94,9 +94,19 @@ def main():
else:
do_apply = True
# First check OS version
+ if sys.byteorder == 'little':
+ # All intel macs are fine
+ print "fixapplypython23: no fix is needed on MacOSX on Intel"
+ sys.exit(0)
+
if gestalt.gestalt('sysv') < 0x1030:
print 'fixapplepython23: no fix needed on MacOSX < 10.3'
sys.exit(0)
+
+ if gestalt.gestalt('sysv') >= 0x1040:
+ print 'fixapplepython23: no fix needed on MacOSX >= 10.4'
+ sys.exit(0)
+
# Test that a framework Python is indeed installed
if not os.path.exists(MAKEFILE):
print 'fixapplepython23: Python framework does not appear to be installed (?), nothing fixed'