[pypy-commit] pypy default: Fix FreeBSD compile flags issues

rlamy noreply at buildbot.pypy.org
Fri Jan 30 21:49:56 CET 2015


Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: 
Changeset: r75590:9e7b2bbd471c
Date: 2015-01-30 20:49 +0000
http://bitbucket.org/pypy/pypy/changeset/9e7b2bbd471c/

Log:	Fix FreeBSD compile flags issues

diff --git a/rpython/translator/platform/freebsd.py b/rpython/translator/platform/freebsd.py
--- a/rpython/translator/platform/freebsd.py
+++ b/rpython/translator/platform/freebsd.py
@@ -12,6 +12,7 @@
     cflags = tuple(
         ['-O3', '-pthread', '-fomit-frame-pointer'] +
         os.environ.get('CFLAGS', '').split())
+    rpath_flags = ['-Wl,-rpath=\'$$ORIGIN/\'',  '-Wl,-z,origin']
 
 class Freebsd_64(Freebsd):
     shared_only = ('-fPIC',)
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
@@ -112,9 +112,9 @@
             target_name = exe_name.basename
 
         if shared:
-            cflags = self.cflags + self.get_shared_only_compile_flags()
+            cflags = tuple(self.cflags) + self.get_shared_only_compile_flags()
         else:
-            cflags = self.cflags + self.standalone_only
+            cflags = tuple(self.cflags) + tuple(self.standalone_only)
 
         m = GnuMakefile(path)
         m.exe_name = path.join(exe_name.basename)


More information about the pypy-commit mailing list