Commits

Dan Villiom Podlaski Christiansen committed b5eaee0

Rebased.

Comments (0)

Files changed (2)

drop-macosx-version-min.diff

 # HG changeset patch
 # User Dan Villiom Podlaski Christiansen <dan@cabo.dk>
 # Date 1307714547 -7200
-# Node ID a649690cfe8750d1b924cc99681ded588525be11
-# Parent  8fbb33521dee90cee97a51c6573cafdab3cb79ee
+# Node ID 59da77666c5195625d7dc9beaf8fcff819aa1cbd
+# Parent  38b3bfe9ac3f0332ebb63c5347eb4c5b7cc282c2
 [mq]: drop-macosx-version-min.diff
 
 diff --git a/pypy/translator/platform/darwin.py b/pypy/translator/platform/darwin.py
 # HG changeset patch
 # User Dan Villiom Podlaski Christiansen  <danchr@gmail.com>
 # Date 1308039653 -7200
-# Node ID 303562eb6a35a74c30c53c119e1775f69d26249a
-# Parent 7150706c18dbb7dee4a700ad1f08f49e298f871e
+# Node ID f2081ca95ef097e593bb83c828fdb667050f812b
+# Parent 090bfeed33d88f9e6894f2bb1eaef6d189cd6736
 Hack to fix translation on Darwin
 
-diff --git a/pypy/translator/platform/posix.py b/pypy/translator/platform/posix.py
---- a/pypy/translator/platform/posix.py
-+++ b/pypy/translator/platform/posix.py
-@@ -20,7 +20,9 @@ class BasePosix(Platform):
-         self.cc = cc
+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
+@@ -29,6 +29,15 @@ class Darwin(posix.BasePosix):
+                 + ['-dynamiclib', '-undefined', 'dynamic_lookup']
+                 + args)
+     
++    def _libs(self, libraries):
++        args = []
++        for lib in libraries:
++            args.append('-l' + lib)
++            # FIXME: using -reexport-l is arguably incorrect, but allows RFFI
++            # to continue pointlessly reexporting imported symbols
++            args.append('-reexport-l' + lib)
++        return ['-reexport-l%s' % lib for lib in libraries]
++
+     def _include_dirs_for_libffi(self):
+         return ['/usr/include/ffi']
  
-     def _libs(self, libraries):
--        return ['-l%s' % lib for lib in libraries]
-+        # FIXME: using -reexport-l instead of -l is arguably incorrect, but
-+        # allows RFFI to continue pointlessly reexporting imported symbols
-+        return ['-reexport-l%s' % lib for lib in libraries]
- 
-     def _libdirs(self, library_dirs):
-         return ['-L%s' % ldir for ldir in library_dirs]