Commits

Armin Rigo committed 7a4f79c

Merge trunk's r79536 and r79541 from antocuni:

(mvt) fix os/x 64 bit translation
(mvt) hopefully *really* fix translation :-)

  • Participants
  • Parent commits 10c7109
  • Branches 1.4.x

Comments (0)

Files changed (2)

pypy/translator/c/gcc/trackgcroot.py

     format = 'darwin64'
     function_names_prefix = '_'
 
-    LABEL = ElfFunctionGcRootTracker32.LABEL
+    LABEL = ElfFunctionGcRootTracker64.LABEL
     r_jmptable_item = re.compile(r"\t.(?:long|quad)\t"+LABEL+"(-\"?[A-Za-z0-9$]+\"?)?\s*$")
 
     r_functionstart = re.compile(r"_(\w+):\s*$")

pypy/translator/platform/darwin.py

 
     so_ext = 'so'
     
+    default_cc = 'gcc'
+
     def __init__(self, cc=None):
         if cc is None:
             try:
                 cc = os.environ['CC']
             except KeyError:
-                cc = 'gcc'
+                cc = self.default_cc
         self.cc = cc
 
     def _args_for_shared(self, args):
     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'