[pypy-commit] pypy default: Move this logic here, so that it is also used for Linux64.

arigo noreply at buildbot.pypy.org
Sun Oct 16 23:08:52 CEST 2011


Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r48093:ad955890a446
Date: 2011-10-16 17:47 +0200
http://bitbucket.org/pypy/pypy/changeset/ad955890a446/

Log:	Move this logic here, so that it is also used for Linux64.

diff --git a/pypy/translator/platform/linux.py b/pypy/translator/platform/linux.py
--- a/pypy/translator/platform/linux.py
+++ b/pypy/translator/platform/linux.py
@@ -24,15 +24,14 @@
         return self._pkg_config("libffi", "--libs-only-L",
                                 ['/usr/lib/libffi'])
 
+    def library_dirs_for_libffi_a(self):
+        # places where we need to look for libffi.a
+        return self.library_dirs_for_libffi() + ['/usr/lib']
+
 
 class Linux(BaseLinux):
     shared_only = ()    # it seems that on 32-bit linux, compiling with -fPIC
                         # gives assembler that asmgcc is not happy about.
 
-    def library_dirs_for_libffi_a(self):
-        # places where we need to look for libffi.a
-        return self.library_dirs_for_libffi() + ['/usr/lib']
-
-
 class Linux64(BaseLinux):
     pass


More information about the pypy-commit mailing list