Skip to content
Snippets Groups Projects
Commit dd3607cb authored by Andrew de Laix's avatar Andrew de Laix
Browse files

fix possible races with configures during TC build.

parent 3fa0ae7d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.hgignore
+ 1
− 0
View file @ dd3607cb
...@@ -11,6 +11,7 @@ syntax: glob ...@@ -11,6 +11,7 @@ syntax: glob
*.DS_Store *.DS_Store
LICENSES LICENSES
indra/.distcc indra/.distcc
build-linux-*
build-darwin-* build-darwin-*
build-vc80/ build-vc80/
indra/build-vc[0-9]* indra/build-vc[0-9]*
......
build.sh
+ 4
− 2
View file @ dd3607cb
...@@ -51,7 +51,6 @@ pre_build() ...@@ -51,7 +51,6 @@ pre_build()
{ {
local variant="$1" local variant="$1"
begin_section "Pre$variant" begin_section "Pre$variant"
"$AUTOBUILD" install --skip-license-check
"$AUTOBUILD" configure -c $variant -- -DPACKAGE:BOOL=ON -DRELEASE_CRASH_REPORTING:BOOL=ON "$AUTOBUILD" configure -c $variant -- -DPACKAGE:BOOL=ON -DRELEASE_CRASH_REPORTING:BOOL=ON
end_section "Pre$variant" end_section "Pre$variant"
} }
...@@ -62,7 +61,7 @@ build() ...@@ -62,7 +61,7 @@ build()
if $build_viewer if $build_viewer
then then
begin_section "Viewer$variant" begin_section "Viewer$variant"
if "$AUTOBUILD" build -c $variant if "$AUTOBUILD" build -c $variant --no-configure
then then
echo true >"$build_dir"/build_ok echo true >"$build_dir"/build_ok
else else
...@@ -142,6 +141,9 @@ fi ...@@ -142,6 +141,9 @@ fi
# load autbuild provided shell functions and variables # load autbuild provided shell functions and variables
eval "$("$AUTOBUILD" source_environment)" eval "$("$AUTOBUILD" source_environment)"
# Install packages.
"$AUTOBUILD" install --skip-license-check
# Now run the build # Now run the build
succeeded=true succeeded=true
build_processes= build_processes=
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment