Skip to content
Snippets Groups Projects
Commit ab46c922 authored by Oz Linden's avatar Oz Linden
Browse files

block additional packages on Linux... earlier

parent 812d454e
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
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