Fix wx-config references, also don't run configure under bash.

Originally committed to SVN as r4040.
This commit is contained in:
Amar Takhar 2010-01-25 21:45:48 +00:00
parent ac2a41e9f0
commit f3f6a90bbe

View file

@ -156,7 +156,7 @@ flinux.addStep(shell.ShellCommand(
WithProperties("--with-build-credit=BuildBot: %s (%s)", "buildername", "slavename"), WithProperties("--with-build-credit=BuildBot: %s (%s)", "buildername", "slavename"),
"--disable-check-wx-stc", "--disable-check-wx-stc",
"--disable-check-wx-opengl", "--disable-check-wx-opengl",
"--with-wx-config=/home/verm/build/wx/lib/wx/config/gtk2-unicode-debug-2.9" "--with-wx-config=/home/verm/build/wx-trunk/bin/wx-config"
], ],
env={ env={
'CC': '/usr/lib/ccache/gcc', 'CC': '/usr/lib/ccache/gcc',
@ -215,10 +215,10 @@ ffbsd.addStep(shell.ShellCommand(
)) ))
ffbsd.addStep(shell.ShellCommand( ffbsd.addStep(shell.ShellCommand(
command=["/usr/local/bin/bash", "./configure", command=["./configure",
"--prefix=/usr/local", "--prefix=/usr/local",
WithProperties("--with-build-credit=BuildBot: %s (%s)", "buildername", "slavename"), WithProperties("--with-build-credit=BuildBot: %s (%s)", "buildername", "slavename"),
"--with-wx-config=/usr/home/verm/build/wx/lib/wx/config/gtk2-unicode-debug-2.9", "--with-wx-config=/home/verm/build/wx-trunk/bin/wx-config",
"--enable-maintainer-mode", "--enable-maintainer-mode",
"--disable-check-wx-opengl", "--disable-check-wx-opengl",
"--disable-check-wx-stc" "--disable-check-wx-stc"