[pypy-svn] r20801 - in pypy/dist/pypy/translator/llvm: . module

[ericvrp at codespeak.net]

Author: ericvrp
Date: Tue Dec  6 18:28:45 2005
New Revision: 20801

Modified:
   pypy/dist/pypy/translator/llvm/build_llvm_module.py
   pypy/dist/pypy/translator/llvm/externs2ll.py
   pypy/dist/pypy/translator/llvm/gc.py
   pypy/dist/pypy/translator/llvm/module/genexterns.c
Log:
Removed some hardcoded library and include paths

Modified: pypy/dist/pypy/translator/llvm/build_llvm_module.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/build_llvm_module.py	(original)
+++ pypy/dist/pypy/translator/llvm/build_llvm_module.py	Tue Dec  6 18:28:45 2005
@@ -87,7 +87,9 @@
     cleanup = False
 
     if sys.platform == 'darwin':
-        gc_libs_path = '-L/sw/lib -ldl'
+        import distutils.sysconfig
+        libdir = distutils.sysconfig.EXEC_PREFIX + "/lib"
+        gc_libs_path = '-L%s -ldl' % libdir
     else:
         gc_libs_path = '-static'
 

Modified: pypy/dist/pypy/translator/llvm/externs2ll.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/externs2ll.py	(original)
+++ pypy/dist/pypy/translator/llvm/externs2ll.py	Tue Dec  6 18:28:45 2005
@@ -42,7 +42,8 @@
     f.close()
 
     plain = filename[:-2]
-    cmd = "llvm-gcc -I%s -I%s -I%s -S %s.c -o %s.ll 2>&1" % (get_llvm_cpath(),
+    cmd = "llvm-gcc -I%s -I%s -I%s -I%s -S %s.c -o %s.ll 2>&1" % (get_llvm_cpath(),
+                                                             get_incdir(),
                                                              get_c_cpath(),
                                                              get_python_inc(),
                                                              plain,
@@ -137,6 +138,10 @@
     import distutils.sysconfig
     return distutils.sysconfig.get_python_inc()
 
+def get_incdir():
+    import distutils.sysconfig
+    return distutils.sysconfig.EXEC_PREFIX + "/include"
+
 def generate_llfile(db, extern_decls, entrynode, standalone):
     ccode = []
     function_names = []

Modified: pypy/dist/pypy/translator/llvm/gc.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/gc.py	(original)
+++ pypy/dist/pypy/translator/llvm/gc.py	Tue Dec  6 18:28:45 2005
@@ -20,10 +20,11 @@
 
     def new(gcpolicy=None):  #factory
         gcpolicy = gcpolicy or 'boehm'
-        
+
+        import distutils.sysconfig
         from os.path import exists
-        boehm_on_path = exists('/usr/lib/libgc.so') or exists('/usr/lib/libgc.a') or \
-                        exists('/sw/lib/libgc.so') or exists('/sw/lib/libgc.a')
+        libdir = distutils.sysconfig.EXEC_PREFIX + "/lib"  
+        boehm_on_path = exists(libdir + '/libgc.so') or exists(libdir + '/libgc.a')
         if gcpolicy == 'boehm' and not boehm_on_path:
             log.gc.WARNING('warning: Boehm GC libary not found in /usr/lib, falling back on no gc')
             gcpolicy = 'none'

Modified: pypy/dist/pypy/translator/llvm/module/genexterns.c
==============================================================================
--- pypy/dist/pypy/translator/llvm/module/genexterns.c	(original)
+++ pypy/dist/pypy/translator/llvm/module/genexterns.c	Tue Dec  6 18:28:45 2005
@@ -60,7 +60,7 @@
   memcpy((void *) ptr2, (void *) ptr1, size);
 }
 
-#include <gc/gc.h>
+#include <gc.h>
 #define USING_BOEHM_GC
 
 char *LLVM_RPython_StartupCode();