commit 45c60c0dd6a337bf26e571a85e8cb076d6711ec0
author Manoj Gupta <manojgupta@google.com> Tue May 16 16:29:28 2023 +0000
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu May 18 21:16:30 2023 +0000
tree bd45d205afc23d91549bf94c5e5b6dfeef9f7f4d
parent 725a269554cb76d55905e3f8becc5068eb63ffc5

scripts: cros_setup_toolchains.py: Add libc++ for armv6m

Add libc++ packages to arm-none-eabi
which will target armv6m.

BUG=b:281531340
TEST=cros_setup_toolchains.

Cq-Depend: chromium:4517739
Change-Id: I17918748632955a6db76fbf14a084f9fa0eee675
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/4539406
Commit-Queue: Manoj Gupta <manojgupta@chromium.org>
Reviewed-by: Mike Frysinger <vapier@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 d3bf0ef..2b547c5 100644
--- a/scripts/cros_setup_toolchains.py
+++ b/scripts/cros_setup_toolchains.py
@@ -107,6 +107,7 @@
 CROSSDEV_COMPILER_RT_ARGS = ["--ex-pkg", "sys-libs/compiler-rt"]
 
 TARGET_LLVM_PKGS_ENABLED = (
+    "arm-none-eabi",
     "armv7m-cros-eabi",
     "armv7a-cros-linux-gnueabi",
     "armv7a-cros-linux-gnueabihf",
@@ -1537,6 +1538,20 @@
         else set()
     )
 
+    # pylint: disable=global-statement
+    # Disable installing libc++ for arm-none-eabi till new binary prebuilt
+    # package is available. TODO(b/281531340): Remove once done.
+    global TARGET_LLVM_PKGS_ENABLED
+    if options.usepkg:
+        TARGET_LLVM_PKGS_ENABLED = (
+            "armv7m-cros-eabi",
+            "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: