From da920eab42162ef2ed68a6a736a491cdfcd76b32 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 10 Aug 2013 03:40:26 +0000 Subject: configure: Fix build when clang is installed to a non-standard prefix llvm-svn: 188129 --- libclc/configure.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'libclc/configure.py') diff --git a/libclc/configure.py b/libclc/configure.py index 79cc4df704f..b385fb8b309 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", -- cgit v1.2.3