From 812d454ecfaed19ae4ddff87417a4866c0e3dae3 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Wed, 23 Mar 2016 16:12:30 -0400
Subject: [PATCH] disable building of additional viewer packages on linux
---
build.sh | 14 +++++++-------
1 file 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
--
GitLab