[pypy-commit] pypy default: fix library dir inclusion for cross compilation builds

[bivab]

Author: David Schneider <david.schneider at picle.org>
Branch: 
Changeset: r63765:22402f1ba4ea
Date: 2013-04-30 08:41 +0000
http://bitbucket.org/pypy/pypy/changeset/22402f1ba4ea/

Log:	fix library dir inclusion for cross compilation builds

diff --git a/rpython/translator/platform/arm.py b/rpython/translator/platform/arm.py
--- a/rpython/translator/platform/arm.py
+++ b/rpython/translator/platform/arm.py
@@ -18,9 +18,13 @@
 class ARM(Linux):
     name = "arm"
 
-    available_includedirs = (SB2 + '/usr/include', '/tmp')
+    available_librarydirs = [SB2 + '/usr/lib/arm-linux-gnueabi/',
+                             SB2 + '/usr/lib/arm-linux-gnueabihf/']
+    available_includedirs = [SB2 + '/usr/include/arm-linux-gnueabi/',
+                             SB2 + '/usr/include/arm-linux-gnueabihf/']
     copied_cache = {}
 
+
     def _invent_new_name(self, basepath, base):
         pth = basepath.join(base)
         num = 0
@@ -47,12 +51,13 @@
         return ExecutionResult(returncode, stdout, stderr)
 
     def include_dirs_for_libffi(self):
-        return [SB2 + '/usr/include/arm-linux-gnueabi/',
-		SB2 + '/usr/include/arm-linux-gnueabihf/']
+        return self.available_includedirs
 
     def library_dirs_for_libffi(self):
-        return [SB2 + '/usr/lib/arm-linux-gnueabi/',
-		SB2 + '/usr/lib/arm-linux-gnueabihf/']
+        return self.available_librarydirs
+
+    def _preprocess_library_dirs(self, library_dirs):
+        return list(library_dirs) + self.available_librarydirs
 
     def execute_makefile(self, path_to_makefile, extra_opts=[]):
         if isinstance(path_to_makefile, GnuMakefile):