commit 786072873627972a61444a671e7e075755dc9bf1
author Manoj Gupta <manojgupta@chromium.org> Mon May 24 16:58:13 2021 +0000
committer Commit Bot <commit-bot@chromium.org> Wed May 26 16:46:05 2021 +0000
tree 78f8cecc1551fcfe260e580b2191574f6eff66af
parent 77e0bf882dad054d3880e5c6fde618dbbb0c3886

cros_setup_toolchains: Build go after llvm packages

building go requires a working target C++ toolchain. So move it
after building LLVM packages.

BUG=b:187785190
TEST=sdk tryjob

Change-Id: I65e0d65422146a82331048a976e667f5f4bcf954
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2915116
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Manoj Gupta <manojgupta@chromium.org>
Tested-by: Manoj Gupta <manojgupta@chromium.org>

scripts/cros_setup_toolchains.py

diff --git a/scripts/cros_setup_toolchains.py b/scripts/cros_setup_toolchains.py
index 1040563..2dba837 100644
--- a/scripts/cros_setup_toolchains.py
+++ b/scripts/cros_setup_toolchains.py
@@ -202,11 +202,11 @@
         cmd = ['crossdev', '--show-target-cfg', '--ex-gdb']
         if target in TARGET_COMPILER_RT_ENABLED:
           cmd.extend(CROSSDEV_COMPILER_RT_ARGS)
-        if target in TARGET_GO_ENABLED:
-          cmd.extend(CROSSDEV_GO_ARGS)
         if target in TARGET_LLVM_PKGS_ENABLED:
           for pkg in LLVM_PKGS_TABLE:
             cmd.extend(LLVM_PKGS_TABLE[pkg])
+        if target in TARGET_GO_ENABLED:
+          cmd.extend(CROSSDEV_GO_ARGS)
         cmd.extend(['-t', target])
         # Catch output of crossdev.
         out = cros_build_lib.run(