summaryrefslogtreecommitdiff
path: root/build.sh
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-03-18 21:33:43 -0400
committerOz Linden <oz@lindenlab.com>2011-03-18 21:33:43 -0400
commit9693227cb41f909ef66f86e6699ad0bf124a7e83 (patch)
treea3cfdadfb951efffca4c62b070f7add094a0df7c /build.sh
parent8468670583db601c5feb683de6b27caf74744e45 (diff)
parent85ccab2d8178c508e585f987bb076951bf2e9ddb (diff)
pull fix from merov_linden/viewer-autobuild2010
Diffstat (limited to 'build.sh')
-rwxr-xr-xbuild.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/build.sh b/build.sh
index 9801726448..bb645b4d7e 100755
--- a/build.sh
+++ b/build.sh
@@ -51,7 +51,7 @@ pre_build()
{
local variant="$1"
begin_section "Pre$variant"
- "$AUTOBUILD" configure -c $variant -- -DPACKAGE:BOOL=ON -DRELEASE_CRASH_REPORTING:BOOL=ON -DUSE_PRECOMPILED_HEADERS=FALSE -DVIEWER_CHANNEL:STRING="$viewer_channel"
+ "$AUTOBUILD" configure -c $variant -- -DPACKAGE:BOOL=ON -DRELEASE_CRASH_REPORTING:BOOL=ON -DUSE_PRECOMPILED_HEADERS=FALSE "-DVIEWER_CHANNEL:STRING=\"$viewer_channel\"" "-DVIEWER_LOGIN_CHANNEL:STRING=\"$viewer_login_channel\""
end_section "Pre$variant"
}
@@ -61,7 +61,7 @@ build()
if $build_viewer
then
begin_section "Viewer$variant"
- if "$AUTOBUILD" build -c $variant
+ if "$AUTOBUILD" build --no-configure -c $variant
then
echo true >"$build_dir"/build_ok
else