* Fix location of Intel wx config.
* Use -Wl,-rpath on Linux. Originally committed to SVN as r3292.
This commit is contained in:
parent
b0063ff46d
commit
c28b51d904
1 changed files with 2 additions and 2 deletions
|
@ -143,7 +143,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': '-rpath /home/verm/build/wx/lib/',
|
'LDFLAGS': '-Wl,-rpath=/home/verm/build/wx/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',
|
||||||
|
@ -302,7 +302,7 @@ fosx.addStep(shell.ShellCommand(
|
||||||
"--prefix=/Users/verm/prefix",
|
"--prefix=/Users/verm/prefix",
|
||||||
WithProperties("--with-build-credit=BuildBot: %s (%s)", "buildername", "slavename"),
|
WithProperties("--with-build-credit=BuildBot: %s (%s)", "buildername", "slavename"),
|
||||||
"--with-apple-opengl-framework",
|
"--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",
|
"--enable-debug",
|
||||||
"--disable-check-wx-opengl",
|
"--disable-check-wx-opengl",
|
||||||
"--disable-check-wx-stc"
|
"--disable-check-wx-stc"
|
||||||
|
|
Loading…
Reference in a new issue