[pypy-commit] pypy default: Merged in __item4__/pypy/osx-libffi (pull request #346)

arigo noreply at buildbot.pypy.org
Tue Oct 20 03:18:10 EDT 2015


Author: Armin Rigo <armin.rigo at gmail.com>
Branch: 
Changeset: r80347:0e33d5f31303
Date: 2015-10-20 09:18 +0200
http://bitbucket.org/pypy/pypy/changeset/0e33d5f31303/

Log:	Merged in __item4__/pypy/osx-libffi (pull request #346)

	Use pkg-config info for osx user and libffi

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
@@ -34,10 +34,14 @@
                 + args)
 
     def _include_dirs_for_libffi(self):
-        return ['/usr/include/ffi']
+        return self._pkg_config("libffi", "--cflags-only-I",
+                                ['/usr/include/ffi'],
+                                check_result_dir=True)
 
     def _library_dirs_for_libffi(self):
-        return ['/usr/lib']
+        return self._pkg_config("libffi", "--libs-only-L",
+                                ['/usr/lib'],
+                                check_result_dir=True)
 
     def _frameworks(self, frameworks):
         args = []


More information about the pypy-commit mailing list