From dd3607cba651439fb1f73e78df38a160a2ef4f5c Mon Sep 17 00:00:00 2001
From: Andrew de Laix <alain@lindenlab.com>
Date: Fri, 21 Jan 2011 22:25:37 +0000
Subject: [PATCH] fix possible races with configures during TC build.
---
.hgignore | 1 +
build.sh | 6 ++++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/.hgignore b/.hgignore
index dbbf8268a98..e10049c68cb 100644
--- a/.hgignore
+++ b/.hgignore
@@ -11,6 +11,7 @@ syntax: glob
*.DS_Store
LICENSES
indra/.distcc
+build-linux-*
build-darwin-*
build-vc80/
indra/build-vc[0-9]*
diff --git a/build.sh b/build.sh
index 052349da9f3..fb46258f467 100755
--- a/build.sh
+++ b/build.sh
@@ -51,7 +51,6 @@ pre_build()
{
local variant="$1"
begin_section "Pre$variant"
- "$AUTOBUILD" install --skip-license-check
"$AUTOBUILD" configure -c $variant -- -DPACKAGE:BOOL=ON -DRELEASE_CRASH_REPORTING:BOOL=ON
end_section "Pre$variant"
}
@@ -62,7 +61,7 @@ build()
if $build_viewer
then
begin_section "Viewer$variant"
- if "$AUTOBUILD" build -c $variant
+ if "$AUTOBUILD" build -c $variant --no-configure
then
echo true >"$build_dir"/build_ok
else
@@ -142,6 +141,9 @@ fi
# load autbuild provided shell functions and variables
eval "$("$AUTOBUILD" source_environment)"
+# Install packages.
+"$AUTOBUILD" install --skip-license-check
+
# Now run the build
succeeded=true
build_processes=
--
GitLab