summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Vesely <jan.vesely@rutgers.edu>2014-09-02 17:54:59 +0000
committerJan Vesely <jan.vesely@rutgers.edu>2014-09-02 17:54:59 +0000
commit62496142d5ecd29dbb35778b84008512ad32d04b (patch)
treed1c422463c3b7aae2ff9f51c85928d41622667eb
parentf55e31a9868f28dd4e70beb21fb141dd873fd030 (diff)
downloadbcm5719-llvm-62496142d5ecd29dbb35778b84008512ad32d04b.tar.gz
bcm5719-llvm-62496142d5ecd29dbb35778b84008512ad32d04b.zip
configure: Add rpath to prepare-builtins util
v2: use space instead of '=' to make Mac happy Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu> Reviewed-by: Jeroen Ketema <j.ketema@imperial.ac.uk> llvm-svn: 216922
-rwxr-xr-xlibclc/configure.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/libclc/configure.py b/libclc/configure.py
index d49f66502ce..7170f46cd7a 100755
--- a/libclc/configure.py
+++ b/libclc/configure.py
@@ -72,6 +72,7 @@ llvm_core_libs = llvm_config(['--libs', 'core', 'bitreader', 'bitwriter']) + ' '
llvm_system_libs + ' ' + \
llvm_config(['--ldflags'])
llvm_cxxflags = llvm_config(['--cxxflags']) + ' -fno-exceptions -fno-rtti'
+llvm_libdir = llvm_config(['--libdir'])
llvm_clang = os.path.join(llvm_bindir, 'clang')
llvm_link = os.path.join(llvm_bindir, 'llvm-link')
@@ -110,7 +111,7 @@ b.rule("OPT", command = llvm_opt + " -O3 -o $out $in",
description = 'OPT $out')
c_compiler_rule(b, "LLVM_TOOL_CXX", 'CXX', cxx_compiler, llvm_cxxflags)
-b.rule("LLVM_TOOL_LINK", cxx_compiler + " -o $out $in %s" % llvm_core_libs, 'LINK $out')
+b.rule("LLVM_TOOL_LINK", cxx_compiler + " -o $out $in %s" % llvm_core_libs + " -Wl,-rpath %s" % llvm_libdir, 'LINK $out')
prepare_builtins = os.path.join('utils', 'prepare-builtins')
b.build(os.path.join('utils', 'prepare-builtins.o'), "LLVM_TOOL_CXX",
OpenPOWER on IntegriCloud