[cfe-commits] [libclc] r169362 - in /libclc/trunk: compile-test.sh configure.py

[Peter Collingbourne]

Author: pcc
Date: Wed Dec  5 01:39:02 2012
New Revision: 169362

URL: http://llvm.org/viewvc/llvm-project?rev=169362&view=rev
Log:
Fix build against recent versions of Clang.  Based on patch by Alastair Donaldson!

Modified:
    libclc/trunk/compile-test.sh
    libclc/trunk/configure.py

Modified: libclc/trunk/compile-test.sh
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/compile-test.sh?rev=169362&r1=169361&r2=169362&view=diff
==============================================================================
--- libclc/trunk/compile-test.sh (original)
+++ libclc/trunk/compile-test.sh Wed Dec  5 01:39:02 2012
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-clang -ccc-host-triple nvptx--nvidiacl -Iptx-nvidiacl/include -Igeneric/include -Xclang -mlink-bitcode-file -Xclang nvptx--nvidiacl/lib/builtins.bc -include clc/clc.h -Dcl_clang_storage_class_specifiers -Dcl_khr_fp64 "$@"
+clang -target nvptx--nvidiacl -Iptx-nvidiacl/include -Igeneric/include -Xclang -mlink-bitcode-file -Xclang nvptx--nvidiacl/lib/builtins.bc -include clc/clc.h -Dcl_clang_storage_class_specifiers -Dcl_khr_fp64 "$@"

Modified: libclc/trunk/configure.py
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/configure.py?rev=169362&r1=169361&r2=169362&view=diff
==============================================================================
--- libclc/trunk/configure.py (original)
+++ libclc/trunk/configure.py Wed Dec  5 01:39:02 2012
@@ -35,7 +35,8 @@
     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')
@@ -97,7 +98,7 @@
   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)