From 59e18e04b2c6c598c06d1a0ab98a71baa830eaf2 Mon Sep 17 00:00:00 2001
From: Dan Albert <danalbert@google.com>
Date: Thu, 27 Aug 2015 23:57:19 -0700
Subject: Don't install GCC to $PACKAGE_DIR.

We don't need to be archiving these build artifacts in their extracted
form on the build server. Build and install to $TMPDIR, but still
package that tarball into $PACKAGE_DIR.

Change-Id: Iba42c19e0f7b49f2da608b577579fcc8871eb85c
---
 build-gcc.sh | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'build-gcc.sh')

diff --git a/build-gcc.sh b/build-gcc.sh
index 4f5a79fad..81cc58978 100755
--- a/build-gcc.sh
+++ b/build-gcc.sh
@@ -199,7 +199,7 @@ if [ -z "$HOST_TAG" ]; then
 fi
 
 TOOLCHAIN_SUBDIR=toolchains/$HOST_TAG/$TOOLCHAIN/prebuilt
-TOOLCHAIN_INSTALL_PATH=$PACKAGE_DIR/$TOOLCHAIN_SUBDIR
+TOOLCHAIN_INSTALL_PATH=$TMPDIR/$TOOLCHAIN_SUBDIR
 dump "Using TOOLCHAIN_INSTALL_PATH=$TOOLCHAIN_INSTALL_PATH"
 dump "Using TOOLCHAIN_SUBDIR=$TOOLCHAIN_SUBDIR"
 TOOLCHAIN_BUILD_SYSROOT=$TOOLCHAIN_INSTALL_PATH/sysroot
@@ -529,18 +529,13 @@ if [ -f "$SRC_DIR/SOURCES" ]; then
     cp "$SRC_DIR/SOURCES" "$TOOLCHAIN_INSTALL_PATH/SOURCES"
 fi
 
-echo "Removing sysroot for $TC"
+echo "Removing sysroot for $TOOLCHAIN"
 rm -rf $TOOLCHAIN_INSTALL_PATH/sysroot
 
-# TODO: Do we not actually know what $SYSTEM is going to be here?
-# Why do we need to check these and the above?
-rm -rf $DSTDIR64/toolchains/${SYSTEM}_64/$TC/prebuilt/sysroot
-rm -rf $DSTDIR64/toolchains/${SYSTEM}-x86_64/$TC/prebuilt/sysroot
-
 if [ "$PACKAGE_DIR" ]; then
     ARCHIVE="$TOOLCHAIN-$HOST_TAG.tar.bz2"
-    dump "Packaging $ARCHIVE from $PACKAGE_DIR/$TOOLCHAIN_SUBDIR"
-    pack_archive "$PACKAGE_DIR/$ARCHIVE" "$PACKAGE_DIR" "$TOOLCHAIN_SUBDIR"
+    dump "Packaging $ARCHIVE from $TMPDIR/$TOOLCHAIN_SUBDIR"
+    pack_archive "$PACKAGE_DIR/$ARCHIVE" "$TMPDIR" "$TOOLCHAIN_SUBDIR"
     fail_panic "Could not package $TOOLCHAIN GCC!"
 fi
 
-- 
cgit v1.2.3