diff options
| author | Tom Stellard <thomas.stellard@amd.com> | 2013-08-10 03:40:26 +0000 |
|---|---|---|
| committer | Tom Stellard <thomas.stellard@amd.com> | 2013-08-10 03:40:26 +0000 |
| commit | da920eab42162ef2ed68a6a736a491cdfcd76b32 (patch) | |
| tree | a8f19edd1b200e28b7463911f0516a34200d2491 | |
| parent | c7367ffdab078477e97e9d3ba5d69e818e0b41f1 (diff) | |
| download | llvm-da920eab42162ef2ed68a6a736a491cdfcd76b32.zip llvm-da920eab42162ef2ed68a6a736a491cdfcd76b32.tar.gz llvm-da920eab42162ef2ed68a6a736a491cdfcd76b32.tar.bz2 | |
configure: Fix build when clang is installed to a non-standard prefix
llvm-svn: 188129
| -rwxr-xr-x | libclc/configure.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libclc/configure.py b/libclc/configure.py index 79cc4df..b385fb8 100755 --- a/libclc/configure.py +++ b/libclc/configure.py @@ -65,6 +65,7 @@ llvm_core_libs = llvm_config(['--libs', 'core', 'bitreader', 'bitwriter']) + ' ' llvm_config(['--ldflags']) llvm_cxxflags = llvm_config(['--cxxflags']) + ' -fno-exceptions -fno-rtti' +llvm_clang_cxx = os.path.join(llvm_bindir, 'clang++') llvm_clang = os.path.join(llvm_bindir, 'clang') llvm_link = os.path.join(llvm_bindir, 'llvm-link') llvm_opt = os.path.join(llvm_bindir, 'opt') @@ -95,8 +96,8 @@ b.rule("LLVM_LINK", command = llvm_link + " -o $out $in", b.rule("OPT", command = llvm_opt + " -O3 -o $out $in", description = 'OPT $out') -c_compiler_rule(b, "LLVM_TOOL_CXX", 'LLVM-CXX', 'clang++', llvm_cxxflags) -b.rule("LLVM_TOOL_LINK", "clang++ -o $out $in %s" % llvm_core_libs, 'LINK $out') +c_compiler_rule(b, "LLVM_TOOL_CXX", 'LLVM-CXX', llvm_clang_cxx, llvm_cxxflags) +b.rule("LLVM_TOOL_LINK", llvm_clang_cxx + " -o $out $in %s" % llvm_core_libs, 'LINK $out') prepare_builtins = os.path.join('utils', 'prepare-builtins') b.build(os.path.join('utils', 'prepare-builtins.o'), "LLVM_TOOL_CXX", |