commit 1bcd93d5e94ac4116b8963f1e296fffea9e5f710
author Robert Kolchmeyer <rkolchmeyer@google.com> Tue Dec 13 17:04:00 2022 -0800
committer Robert Kolchmeyer <rkolchmeyer@google.com> Fri Dec 16 19:59:39 2022 +0000
tree 1ebb057e9978af69fa205d0e2dd25eb18efbd1b8
parent 5b3e19f6479d101d93c186bfdae7fa3bed9fe5a1

LAKITU: Update libcxxabi with libcxx

libcxxabi was merged into libcxx. We need to update both at the same
time to avoid file conflicts.

BUG=b/257271340
TEST=presubmit
RELEASE_NOTE=None

Change-Id: Ic5d38ac1c9c2d7a9ca03e35944cfb226c04495d8
Reviewed-on: https://cos-review.googlesource.com/c/third_party/platform/crosutils/+/40096
Reviewed-by: Vaibhav Rustagi <vaibhavrustagi@google.com>
Tested-by: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com>
Reviewed-by: Oleksandr Tymoshenko <ovt@google.com>

sdk_lib/make_chroot.sh

diff --git a/sdk_lib/make_chroot.sh b/sdk_lib/make_chroot.sh
index 21a761d..4c1aa23 100755
--- a/sdk_lib/make_chroot.sh
+++ b/sdk_lib/make_chroot.sh
@@ -293,7 +293,7 @@
 
   # Next libcxx. This is required due to the migration to LLVM runtime builds.
   early_enter_chroot ${EMERGE_CMD} -uN --nodeps ${USEPKG} \
-    sys-libs/libcxx
+    sys-libs/libcxxabi sys-libs/libcxx
 
   # Now we can let the rest of the compiler packages build in parallel as they
   # don't generally rely on each other.