* Fix location of Intel wx config.

* Use -Wl,-rpath on Linux.

Originally committed to SVN as r3292.
This commit is contained in:
Amar Takhar 2009-07-26 17:22:27 +00:00
parent b0063ff46d
commit c28b51d904

View file

@ -143,7 +143,7 @@ flinux.addStep(shell.ShellCommand(
env={
'CC': '/usr/lib/ccache/gcc',
'CXX': '/usr/lib/ccache/g++',
'LDFLAGS': '-rpath /home/verm/build/wx/lib/',
'LDFLAGS': '-Wl,-rpath=/home/verm/build/wx/lib',
'CCACHE_PATH': '/usr/bin',
'CCACHE_DIR': '/home/verm/.ccache',
'LUA_CFLAGS': '-I/usr/include/lua5.1',
@ -302,7 +302,7 @@ fosx.addStep(shell.ShellCommand(
"--prefix=/Users/verm/prefix",
WithProperties("--with-build-credit=BuildBot: %s (%s)", "buildername", "slavename"),
"--with-apple-opengl-framework",
"--with-wx-config=/Users/verm/prefix/lib/wx/config/osx_cocoa-unicode-debug-2.9",
"--with-wx-config=/Users/verm/prefix/lib/wx/config/osx_carbon-unicode-debug-2.9",
"--enable-debug",
"--disable-check-wx-opengl",
"--disable-check-wx-stc"