From ab46c9226bd9048fa218f54bc8668594401529e7 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Thu, 24 Mar 2016 15:39:18 -0400
Subject: [PATCH] block additional packages on Linux... earlier
---
build.sh | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/build.sh b/build.sh
index 47308660238..7ea67b28d4a 100755
--- a/build.sh
+++ b/build.sh
@@ -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
--
GitLab