block additional packages on Linux... earlier

master
Oz Linden 2016-03-24 15:39:18 -04:00
parent 812d454ecf
commit ab46c9226b
1 changed files with 7 additions and 7 deletions

View File

@ -146,13 +146,6 @@ build()
local variant="$1"
if $build_viewer
then
if [ "$arch" = "Linux" ]
then
## something about the additional_packages mechanism messes up buildscripts results.py
## since we don't care about those packages on Linux, just zero it out, yes - a HACK
export additional_packages=""
fi
"$autobuild" build --quiet --no-configure -c $variant
build_ok=$?
@ -213,6 +206,13 @@ fi
# load autobuild provided shell functions and variables
eval "$("$autobuild" source_environment)"
# something about the additional_packages mechanism messes up buildscripts results.py on Linux
# since we don't care about those packages on Linux, just zero it out, yes - a HACK
if [ "$arch" = "Linux" ]
then
export additional_packages=
fi
# dump environment variables for debugging
begin_section "Environment"
env|sort