commit 847b60945fbe11d32d50a1ee46b12af7127b7e9d
author Manoj Gupta <manojgupta@google.com> Wed Jun 01 10:26:34 2022 -0700
committer Manoj Gupta <manojgupta@chromium.org> Thu Jun 02 15:32:47 2022 +0000
tree 30e7530df450a9fc9e7b2a46eaa355521b6d03bc
parent 5f9732d854bc19d908d3f715a5bae4536768299b

cros_setup_toolchains: Add libc++ to armv7m-cros-eabi

BUG=b:234507656
TEST=sudo `which cros_setup_toolchains` -t armv7m-cros-eabi --nousepkg

Cq-Depend: chromium:3683668
Change-Id: I7d5bec89aa41874d9db6867b75ffc0911bbd6dc7
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/3684149
Auto-Submit: Manoj Gupta <manojgupta@chromium.org>
Tested-by: Manoj Gupta <manojgupta@chromium.org>
Reviewed-by: Tom Hughes <tomhughes@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>

scripts/cros_setup_toolchains.py

diff --git a/scripts/cros_setup_toolchains.py b/scripts/cros_setup_toolchains.py
index 6678e97..da8dab4 100644
--- a/scripts/cros_setup_toolchains.py
+++ b/scripts/cros_setup_toolchains.py
@@ -104,6 +104,7 @@
 CROSSDEV_COMPILER_RT_ARGS = ['--ex-pkg', 'sys-libs/compiler-rt']
 
 TARGET_LLVM_PKGS_ENABLED = (
+    'armv7m-cros-eabi',
     'armv7a-cros-linux-gnueabi',
     'armv7a-cros-linux-gnueabihf',
     'aarch64-cros-linux-gnu',
@@ -1384,6 +1385,18 @@
   boards_wanted = (set(options.include_boards.split(','))
                    if options.include_boards else set())
 
+  # pylint: disable=global-statement
+  # Disable installing libc++ for armv7m-cros-eabi till new binary prebuilt
+  # package is available. TODO(b/234507656): Remove once done.
+  global TARGET_LLVM_PKGS_ENABLED
+  if options.usepkg:
+    TARGET_LLVM_PKGS_ENABLED = (
+      'armv7a-cros-linux-gnueabi',
+      'armv7a-cros-linux-gnueabihf',
+      'aarch64-cros-linux-gnu',
+      'i686-cros-linux-gnu',
+      'x86_64-cros-linux-gnu',
+    )
   if options.cfg_name:
     ShowConfig(options.cfg_name)
   elif options.show_packages is not None: