diff options
author | Oz Linden <oz@lindenlab.com> | 2016-03-24 15:39:18 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2016-03-24 15:39:18 -0400 |
commit | ab46c9226bd9048fa218f54bc8668594401529e7 (patch) | |
tree | 9c67c0a17672c68b2c675f0b335142a6d0a0ba58 /build.sh | |
parent | 812d454ecfaed19ae4ddff87417a4866c0e3dae3 (diff) |
block additional packages on Linux... earlier
Diffstat (limited to 'build.sh')
-rwxr-xr-x | build.sh | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -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 |