fix possible races with configures during TC build.
parent
3fa0ae7df8
commit
dd3607cba6
|
|
@ -11,6 +11,7 @@ syntax: glob
|
|||
*.DS_Store
|
||||
LICENSES
|
||||
indra/.distcc
|
||||
build-linux-*
|
||||
build-darwin-*
|
||||
build-vc80/
|
||||
indra/build-vc[0-9]*
|
||||
|
|
|
|||
6
build.sh
6
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=
|
||||
|
|
|
|||
Loading…
Reference in New Issue