commit f6febab226c8ef6509af5518894d3bf1081c4002
author Bertrand SIMONNET <bsimonnet@chromium.org> Fri Oct 03 10:59:43 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Fri Oct 24 00:16:59 2014 +0000
tree de3223ac27c50c1d25cfc07ae8caf2940c865215
parent bdfbdc5d2d66de874878dd125914ed2a0baa089b

parallel_emerge: use SYSROOT from the environment

If SYSROOT is set, use it instead of defaulting to /build/board.

BUG=chromium:423159
TEST=Build_packages while setting SYSROOT to a temporary directory.
  The environment sysroot is used.

Change-Id: I35cee2d640fde543c18ea2c41c0e527e5a395986
Reviewed-on: https://chromium-review.googlesource.com/223115
Reviewed-by: David James <davidjames@chromium.org>
Tested-by: Bertrand Simonnet <bsimonnet@chromium.org>
Commit-Queue: Bertrand Simonnet <bsimonnet@chromium.org>

scripts/parallel_emerge.py

diff --git a/scripts/parallel_emerge.py b/scripts/parallel_emerge.py
index 2326c60..c57d8bd 100644
--- a/scripts/parallel_emerge.py
+++ b/scripts/parallel_emerge.py
@@ -280,7 +280,7 @@
     # point our tools at /build/BOARD and to setup cross compiles to the
     # appropriate board as configured in toolchain.conf.
     if self.board:
-      sysroot = cros_build_lib.GetSysroot(board=self.board)
+      sysroot = os.environ.get('SYSROOT', cros_build_lib.GetSysroot(self.board))
       os.environ["PORTAGE_CONFIGROOT"] = sysroot
       os.environ["PORTAGE_SYSROOT"] = sysroot
       os.environ["SYSROOT"] = sysroot