1. Dan Villiom Podlaski Christiansen
  2. pypy-patches

Commits

Dan Villiom Podlaski Christiansen  committed 3c80d27

Update patch.

  • Participants
  • Parent commits 025fe5e
  • Branches default

Comments (0)

Files changed (1)

File default-gcc-4.0.diff

View file
 # HG changeset patch
 # Parent ce9e51f8fe324856ffa14e3758ed37f68eb34ef9
 # User Dan Villiom Podlaski Christiansen <danchr@gmail.com>
-Default to GCC 4.0 on Darwin/i386.
+Default to GCC 4.0 on Darwin/i386 and not only Darwin/x86_64
 
 The default compiler on Mac OS X 10.6 is Apple GCC 4.2. Using it
 causes problems with GC root detection.
 diff --git a/pypy/translator/platform/darwin.py b/pypy/translator/platform/darwin.py
 --- a/pypy/translator/platform/darwin.py
 +++ b/pypy/translator/platform/darwin.py
-@@ -77,6 +77,7 @@ class Darwin_i386(Darwin):
-     link_flags = ('-arch', 'i386', '-mmacosx-version-min=10.4')
-     cflags = ('-arch', 'i386', '-O3', '-fomit-frame-pointer',
-               '-mmacosx-version-min=10.4')
+@@ -12,7 +12,7 @@ class Darwin(posix.BasePosix):
+ 
+     so_ext = 'so'
+     
+-    default_cc = 'gcc'
 +    default_cc = 'gcc-4.0'
  
- class Darwin_x86_64(Darwin):
-     name = "darwin_x86_64"
+     def __init__(self, cc=None):
+         if cc is None:
+@@ -83,4 +83,3 @@ class Darwin_x86_64(Darwin):
+     link_flags = ('-arch', 'x86_64', '-mmacosx-version-min=10.4')
+     cflags = ('-arch', 'x86_64', '-O3', '-fomit-frame-pointer',
+               '-mmacosx-version-min=10.4')
+-    default_cc = 'gcc-4.0'