Fix build against recent versions of Clang. Based on patch by Alastair Donaldson!

[lldb.git] / libclc / configure.py

diff --git a/libclc/configure.py b/libclc/configure.py
index 546bbd3..9ae49b7 100755 (executable)
--- a/libclc/configure.py
+++ b/libclc/configure.py
@@ -35,7 +35,8 @@ def llvm_config(args):
     sys.exit(1)
 
 llvm_bindir = llvm_config(['--bindir'])
     sys.exit(1)
 
 llvm_bindir = llvm_config(['--bindir'])

-llvm_core_libs = llvm_config(['--ldflags', '--libs', 'core', 'bitreader', 'bitwriter'])
+llvm_core_libs = llvm_config(['--libs', 'core', 'bitreader', 'bitwriter']) + ' ' + \
+                 llvm_config(['--ldflags'])

 llvm_cxxflags = llvm_config(['--cxxflags']) + ' -fno-exceptions -fno-rtti'
 
 llvm_clang = os.path.join(llvm_bindir, 'clang')
 llvm_cxxflags = llvm_config(['--cxxflags']) + ' -fno-exceptions -fno-rtti'
 
 llvm_clang = os.path.join(llvm_bindir, 'clang')


@@ -97,7 +98,7 @@ for target in targets:
   install_files += [(incdir, incdir[len(srcdir)+1:]) for incdir in incdirs]
 
   # The rule for building a .bc file for the specified architecture using clang.
   install_files += [(incdir, incdir[len(srcdir)+1:]) for incdir in incdirs]
 
   # The rule for building a .bc file for the specified architecture using clang.

-  clang_bc_flags = "-ccc-host-triple %s -I`dirname $in` %s " \
+  clang_bc_flags = "-target %s -I`dirname $in` %s " \

                    "-Dcl_clang_storage_class_specifiers " \
                    "-Dcl_khr_fp64 " \
                    "-emit-llvm" % (target, clang_cl_includes)
                    "-Dcl_clang_storage_class_specifiers " \
                    "-Dcl_khr_fp64 " \
                    "-emit-llvm" % (target, clang_cl_includes)