Add libcxx to armv7a/aarch64/x86_64 cross targets.
This adds libcxx to cross targets.
BUG=chromium:620402
TEST=cbuildbot chromiumos-sdk falco-release daisy-release kevin-release
setup_board.py --board {falco,daisy,kevin} --nousepkg installs libcxx
Change-Id: I7ea4ac56dfe158eba3e00be8efd6bb18305e4ee7
Reviewed-on: https://chromium-review.googlesource.com/487832
Commit-Ready: Yunlian Jiang <yunlian@chromium.org>
Tested-by: Yunlian Jiang <yunlian@chromium.org>
Reviewed-by: Manoj Gupta <manojgupta@chromium.org>
diff --git a/scripts/cros_setup_toolchains.py b/scripts/cros_setup_toolchains.py
index b6c40d2..660fa73 100644
--- a/scripts/cros_setup_toolchains.py
+++ b/scripts/cros_setup_toolchains.py
@@ -54,6 +54,8 @@
'ex_go' : PACKAGE_NONE,
'ex_compiler-rt': PACKAGE_NONE,
'ex_llvm-libunwind': PACKAGE_NONE,
+ 'ex_libcxxabi': PACKAGE_NONE,
+ 'ex_libcxx': PACKAGE_NONE,
},
}
@@ -79,6 +81,8 @@
LLVM_PKGS_TABLE = {
'ex_llvm-libunwind' : ['--ex-pkg', 'sys-libs/llvm-libunwind'],
+ 'ex_libcxxabi' : ['--ex-pkg', 'sys-libs/libcxxabi'],
+ 'ex_libcxx' : ['--ex-pkg', 'sys-libs/libcxx'],
}
# Overrides for {gcc,binutils}-config, pick a package with particular suffix.
@@ -1221,6 +1225,13 @@
boards_wanted = (set(options.include_boards.split(','))
if options.include_boards else set())
+ # pylint: disable=global-statement
+ # Disable installing llvm pkgs till binary package is available
+ global LLVM_PKGS_TABLE
+ if options.usepkg:
+ LLVM_PKGS_TABLE = {
+ 'ex_llvm-libunwind' : ['--ex-pkg', 'sys-libs/llvm-libunwind'],
+ }
if options.cfg_name:
ShowConfig(options.cfg_name)
elif options.create_packages: