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

[Jan Vesely]

On Tue, 2014-08-26 at 12:28 +0100, Jeroen Ketema wrote:
> LGTM.

thanks. pushed.

jan

> 
> Jeroen
> 
> On 11 Aug 2014, at 15:49, Jan Vesely <jan.vesely at rutgers.edu> wrote:
> 
> > v2: use space instead of '=' to make Mac happy
> > 
> > Signed-off-by: Jan Vesely <jan.vesely at rutgers.edu>
> > ---
> > turns out using space works on linux too
> > 
> > configure.py | 3 ++-
> > 1 file changed, 2 insertions(+), 1 deletion(-)
> > 
> > diff --git a/configure.py b/configure.py
> > index 768a6ad..ece89ed 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')
> > 
> > prepare_builtins = os.path.join('utils', 'prepare-builtins')
> > b.build(os.path.join('utils', 'prepare-builtins.o'), "LLVM_TOOL_CXX",
> > -- 
> > 1.9.3
> > 
> 

-- 
Jan Vesely <jan.vesely at rutgers.edu>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: This is a digitally signed message part
URL: <http://lists.llvm.org/pipermail/libclc-dev/attachments/20140902/8b17c2da/attachment.sig>