diff options
| author | Logan Dethrow <log@lindenlab.com> | 2011-06-01 17:05:38 -0400 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2011-06-01 17:05:38 -0400 |
| commit | 2662c4b679f0eb2745619dc4fd1dd79af65126f0 (patch) | |
| tree | f27ba8675353676d91327fc606b005f0096b2fb9 /build.sh | |
| parent | 4b97f03b04e7df25e5b3622122f6d124d4a5f617 (diff) | |
| parent | 2002a39e4db5ba96f4a0a7653f76a3cd55846a31 (diff) | |
Merge. Pulling fix for VWR-25862 into bigger cache tree.
Diffstat (limited to 'build.sh')
| -rwxr-xr-x | build.sh | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -42,9 +42,13 @@ installer_Linux() installer_CYGWIN() { - d=$(build_dir_CYGWIN ${last_built_variant:-Release}) - p=$(sed 's:.*=::' "$d/newview/${last_built_variant:-Release}/touched.bat") - echo "$d/newview/${last_built_variant:-Release}/$p" + v=${last_built_variant:-Release} + d=$(build_dir_CYGWIN $v) + if [ -r "$d/newview/$v/touched.bat" ] + then + p=$(sed 's:.*=::' "$d/newview/$v/touched.bat") + echo "$d/newview/$v/$p" + fi } pre_build() @@ -58,7 +62,6 @@ pre_build() "$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\"" \ -DGRID:STRING="\"$viewer_grid\"" \ |