Fix -rpath reference so common-respack works correctly.

Originally committed to SVN as r4048.
This commit is contained in:
Amar Takhar 2010-01-26 13:45:07 +00:00
parent b822ec6343
commit 5c00df7209

View file

@ -161,7 +161,7 @@ flinux.addStep(shell.ShellCommand(
env={ env={
'CC': '/usr/lib/ccache/gcc', 'CC': '/usr/lib/ccache/gcc',
'CXX': '/usr/lib/ccache/g++', 'CXX': '/usr/lib/ccache/g++',
'LDFLAGS': '-Wl,-rpath=/home/verm/build/wx/lib', 'LDFLAGS': '-Wl,-rpath=/home/verm/build/wx-trunk/lib',
'CCACHE_PATH': '/usr/bin', 'CCACHE_PATH': '/usr/bin',
'CCACHE_DIR': '/home/verm/.ccache', 'CCACHE_DIR': '/home/verm/.ccache',
'LUA_CFLAGS': '-I/usr/include/lua5.1', 'LUA_CFLAGS': '-I/usr/include/lua5.1',
@ -230,7 +230,7 @@ ffbsd.addStep(shell.ShellCommand(
'CXX': '/usr/local/libexec/ccache/g++', 'CXX': '/usr/local/libexec/ccache/g++',
'CFLAGS': '-I/usr/local/include', 'CFLAGS': '-I/usr/local/include',
'CXXFLAGS': '-I/usr/local/include', 'CXXFLAGS': '-I/usr/local/include',
'LDFLAGS': '-L/usr/local/lib -rpath /usr/home/verm/build/wx/lib', 'LDFLAGS': '-L/usr/local/lib -rpath /usr/home/verm/build/wx-trunk/lib',
'LUA_CFLAGS': '-I/usr/local/include/lua51', 'LUA_CFLAGS': '-I/usr/local/include/lua51',
'LUA_LDFLAGS': '-L/usr/local/lib -llua-5.1' 'LUA_LDFLAGS': '-L/usr/local/lib -llua-5.1'
}, },