From 5a7855d4b388bcf3d365d20e54db227591febeba Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Tue, 30 Aug 2016 08:49:09 -0400
Subject: [PATCH] remove use of old build_ok variable
---
build.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/build.sh b/build.sh
index 80263254eb9..f74501743c5 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
--
GitLab