Author: jvesely
Date: Tue Sep  2 12:54:59 2014
New Revision: 216922

URL: http://llvm.org/viewvc/llvm-project?rev=216922&view=rev
Log:
configure: Add rpath to prepare-builtins util

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

Signed-off-by: Jan Vesely <[email protected]>
Reviewed-by: Jeroen Ketema <[email protected]>

Modified:
    libclc/trunk/configure.py

Modified: libclc/trunk/configure.py
URL: 
http://llvm.org/viewvc/llvm-project/libclc/trunk/configure.py?rev=216922&r1=216921&r2=216922&view=diff
==============================================================================
--- libclc/trunk/configure.py (original)
+++ libclc/trunk/configure.py Tue Sep  2 12:54:59 2014
@@ -72,6 +72,7 @@ llvm_core_libs = llvm_config(['--libs',
                  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
        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",


_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits

Reply via email to