summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2016-08-30 08:49:09 -0400
committerOz Linden <oz@lindenlab.com>2016-08-30 08:49:09 -0400
commit5a7855d4b388bcf3d365d20e54db227591febeba (patch)
tree0a4f914c89aa6e6cf40a2ff617335bc07c927885
parent3c9f7121a2801d44e3db81f212a84a25062debe5 (diff)
remove use of old build_ok variable
-rwxr-xr-xbuild.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/build.sh b/build.sh
index 80263254eb..f74501743c 100755
--- a/build.sh
+++ b/build.sh
@@ -142,9 +142,10 @@ build()
if $build_viewer
then
"$autobuild" build --no-configure -c $variant || fatal "failed building $variant"
-
+ echo true >"$build_dir"/build_ok
+
# Run build extensions
- if [ $build_ok -eq 0 -a -d ${build_dir}/packages/build-extensions ]
+ if [ -d ${build_dir}/packages/build-extensions ]
then
for extension in ${build_dir}/packages/build-extensions/*.sh
do
@@ -157,7 +158,6 @@ build()
# *TODO: Make this a build extension.
package_llphysicsextensions_tpv || fatal "failed building llphysicsextensions packages"
- echo true >"$build_dir"/build_ok
else
echo "Skipping build due to configuration build_viewer=${build_viewer}"
echo true >"$build_dir"/build_ok