summaryrefslogtreecommitdiff
path: root/build.sh
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2016-03-23 16:12:30 -0400
committerOz Linden <oz@lindenlab.com>2016-03-23 16:12:30 -0400
commit812d454ecfaed19ae4ddff87417a4866c0e3dae3 (patch)
treeb5d0b5ef5f6ceb9f7f3eb3fb03f4f21e1353f661 /build.sh
parentc3fd3b41e8690c0df9ef7f05cfba08124b7a0028 (diff)
disable building of additional viewer packages on linux
Diffstat (limited to 'build.sh')
-rwxr-xr-xbuild.sh14
1 files changed, 7 insertions, 7 deletions
diff --git a/build.sh b/build.sh
index 0f3091fb17..4730866023 100755
--- a/build.sh
+++ b/build.sh
@@ -146,6 +146,13 @@ 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=$?
@@ -206,13 +213,6 @@ fi
# load autobuild provided shell functions and variables
eval "$("$autobuild" source_environment)"
-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
-
# dump environment variables for debugging
begin_section "Environment"
env|sort