[pypy-svn] r24522 - pypy/dist/pypy/translator/llvm/pyllvm

[ericvrp at codespeak.net]

Author: ericvrp
Date: Fri Mar 17 15:15:07 2006
New Revision: 24522

Modified:
   pypy/dist/pypy/translator/llvm/pyllvm/setup.py
Log:
Fixes for pyllvm on Linux. Both static and dynamic llvm libs are created
on this platform, we pick the dynamic libs because the static ones give
unresolved symbols. The library order needed to be changed a little to
make things work.


Modified: pypy/dist/pypy/translator/llvm/pyllvm/setup.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/pyllvm/setup.py	(original)
+++ pypy/dist/pypy/translator/llvm/pyllvm/setup.py	Fri Mar 17 15:15:07 2006
@@ -13,15 +13,15 @@
 llvm_libs = [platform2backend[sys.platform]] + """
 Core AsmParser CodeGen SelectionDAG ExecutionEngine
 JIT bzip2 Interpreter DataStructure BCWriter BCReader Target Instrumentation
-ipo ipa Transforms System ScalarOpts Analysis TransformUtils Support""".split()
+ipo ipa Transforms System ScalarOpts TransformUtils Analysis Support""".split()
 
 # figure out if they are a dynamic library or not
 extra_llvm_libs, extra_llvm_dynlibs = [], []
 for o in llvm_libs:
-    if libdir.join("LLVM%s.o" % o).check():
-        extra_llvm_libs.append(libdir.join("LLVM%s.o" % o).strpath)
-    else:
+    if libdir.join("libLLVM%s.a" % o).check():
         extra_llvm_dynlibs.append("LLVM%s" % o)
+    else:
+        extra_llvm_libs.append(libdir.join("LLVM%s.o" % o).strpath)
 
 # globals
 name = 'pyllvm'