[PATCH 1/1] configure: Add rpath to prepare-builtins util

Runtimes OpenCL
1

Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>

2

Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>
---

This enables the build to complete without having llvm libs in LD_LIBRARY_PATH

configure.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/configure.py b/configure.py
index 768a6ad..949ef3a 100755
--- a/configure.py
+++ b/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’)

This breaks building on Mac, where this should be “-Wl,-rpath %s” (space instead of equals sign).

Jeroen

3

v2: use space instead of '=' to make Mac happy

Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>

4

LGTM.

Jeroen

5

LGTM.

thanks. pushed.

jan