cros_setup_toolchains.py: Enable llvm libraries for i686 target
Enable building llvm libraries (libunwind/libc++abi/libc++) for
i686-pc-linux-gnu target.
The libraries will only be built on builders that build
toolchain from source.
For rest of builders, the followup change should install
it once prebuilts have been uploaded by the SDK builder.
BUG=chromium:1144001
TEST=SDK builder passes
Change-Id: I09a97b4c4e3825f0c9d33c826b78d492bc3e020a
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2508881
Reviewed-by: Chris McDonald <cjmcdonald@chromium.org>
Commit-Queue: Manoj Gupta <manojgupta@chromium.org>
Tested-by: Manoj Gupta <manojgupta@chromium.org>
diff --git a/scripts/cros_setup_toolchains.py b/scripts/cros_setup_toolchains.py
index 207f227..e126e6c 100644
--- a/scripts/cros_setup_toolchains.py
+++ b/scripts/cros_setup_toolchains.py
@@ -108,6 +108,7 @@
'armv7a-cros-linux-gnueabi',
'armv7a-cros-linux-gnueabihf',
'aarch64-cros-linux-gnu',
+ 'i686-pc-linux-gnu',
'x86_64-cros-linux-gnu',
)
@@ -1347,6 +1348,18 @@
boards_wanted = (set(options.include_boards.split(','))
if options.include_boards else set())
+ # pylint: disable=global-statement
+ # Disable installing llvm library pkgs till new binary prebuilt packages are
+ # available for i686-pc-linux-gnu tuple. 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',
+ 'x86_64-cros-linux-gnu',
+ )
+
if options.cfg_name:
ShowConfig(options.cfg_name)
elif options.show_packages is not None: