[pypy-commit] pypy default: Merged in jamadden/pypy/osx-flat-namespace (pull request #358)
fijal
noreply at buildbot.pypy.org
Thu Nov 19 09:05:51 EST 2015
Author: Maciej Fijalkowski <fijall at gmail.com>
Branch:
Changeset: r80775:52fb5c4b6cac
Date: 2015-11-19 16:06 +0200
http://bitbucket.org/pypy/pypy/changeset/52fb5c4b6cac/
Log: Merged in jamadden/pypy/osx-flat-namespace (pull request #358)
Fix the cpyext tests on OS X by linking with -flat_namespace.
diff --git a/rpython/translator/platform/darwin.py b/rpython/translator/platform/darwin.py
--- a/rpython/translator/platform/darwin.py
+++ b/rpython/translator/platform/darwin.py
@@ -28,11 +28,11 @@
# needed for cross compiling on ARM, needs fixing if relevant for darwin
if len(rel_libdirs) > 0:
print 'in get_rpath_flags, rel_libdirs is not fixed up',rel_libdirs
- return self.rpath_flags
+ return self.rpath_flags
def _args_for_shared(self, args):
return (list(self.shared_only)
- + ['-dynamiclib', '-install_name', '@rpath/$(TARGET)', '-undefined', 'dynamic_lookup']
+ + ['-dynamiclib', '-install_name', '@rpath/$(TARGET)', '-undefined', 'dynamic_lookup', '-flat_namespace']
+ args)
def _include_dirs_for_libffi(self):
More information about the pypy-commit
mailing list