diff options
| author | Peter Collingbourne <peter@pcc.me.uk> | 2012-12-05 07:39:02 +0000 |
|---|---|---|
| committer | Peter Collingbourne <peter@pcc.me.uk> | 2012-12-05 07:39:02 +0000 |
| commit | db47eac37d5b3aed35eba897712370e40e67eac0 (patch) | |
| tree | 5429e9fa89c7fef491a0feb8f049854701a00634 /libclc | |
| parent | 0afbb325b67b7891fb53641c6d3b245247c19d4c (diff) | |
| download | bcm5719-llvm-db47eac37d5b3aed35eba897712370e40e67eac0.tar.gz bcm5719-llvm-db47eac37d5b3aed35eba897712370e40e67eac0.zip | |
Fix build against recent versions of Clang. Based on patch by Alastair Donaldson!
llvm-svn: 169362
Diffstat (limited to 'libclc')
| -rwxr-xr-x | libclc/compile-test.sh | 2 | ||||
| -rwxr-xr-x | libclc/configure.py | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/libclc/compile-test.sh b/libclc/compile-test.sh index 74618110d5a..47c7f385bb9 100755 --- a/libclc/compile-test.sh +++ b/libclc/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/libclc/configure.py b/libclc/configure.py index 546bbd3c997..9ae49b75265 100755 --- a/libclc/configure.py +++ b/libclc/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) |
