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
......@@ -11,6 +11,7 @@ syntax: glob
*.DS_Store
LICENSES
indra/.distcc
build-linux-*
build-darwin-*
build-vc80/
indra/build-vc[0-9]*
......
......@@ -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=
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment