summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Collingbourne <peter@pcc.me.uk>2012-12-05 07:39:02 +0000
committerPeter Collingbourne <peter@pcc.me.uk>2012-12-05 07:39:02 +0000
commitf07a899158d1f38b231e9a073a6ff0053b04016f (patch)
tree8933887028c3344154cd7da6c18585159b7675d5
parent14e5a4f2116dd512d3bd6489d55760aa487cc3dd (diff)
Fix build against recent versions of Clang. Based on patch by Alastair Donaldson!
git-svn-id: https://llvm.org/svn/llvm-project/libclc/trunk@169362 91177308-0d34-0410-b5e6-96231b3b80d8
-rwxr-xr-xcompile-test.sh2
-rwxr-xr-xconfigure.py5
2 files changed, 4 insertions, 3 deletions
diff --git a/compile-test.sh b/compile-test.sh
index 7461811..47c7f38 100755
--- a/compile-test.sh
+++ b/compile-test.sh
@@ -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 "$@"
diff --git a/configure.py b/configure.py
index 546bbd3..9ae49b7 100755
--- a/configure.py
+++ b/configure.py
@@ -35,7 +35,8 @@ def llvm_config(args):
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 @@ 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.
- 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)