Author: Armin Rigo <[email protected]>
Branch:
Changeset: r90233:31ecf3410703
Date: 2017-02-20 16:28 +0100
http://bitbucket.org/pypy/pypy/changeset/31ecf3410703/
Log: Trying a fix for OS/X, untested (john z. on pypy-dev)
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
@@ -31,8 +31,12 @@
return self.rpath_flags
def _args_for_shared(self, args):
+ if hasattr(self, '_exe_name'):
+ target = os.path.basename(self._exe_name)
+ else:
+ target = '$(TARGET)' # inside a Makefile
return (list(self.shared_only)
- + ['-dynamiclib', '-install_name', '@rpath/$(TARGET)',
'-undefined', 'dynamic_lookup', '-flat_namespace']
+ + ['-dynamiclib', '-install_name', '@rpath/' + target,
'-undefined', 'dynamic_lookup', '-flat_namespace']
+ args)
def _include_dirs_for_libffi(self):
diff --git a/rpython/translator/platform/posix.py
b/rpython/translator/platform/posix.py
--- a/rpython/translator/platform/posix.py
+++ b/rpython/translator/platform/posix.py
@@ -51,6 +51,7 @@
return ["-Wl,--export-dynamic"]
def _link(self, cc, ofiles, link_args, standalone, exe_name):
+ self._exe_name = str(exe_name)
args = [str(ofile) for ofile in ofiles] + link_args
args += ['-o', str(exe_name)]
if not standalone:
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
