[PATCH] D107868: [HIP] use bootstrap to build libc++

[Yaxun Liu via Phabricator via llvm-commits]

yaxunl created this revision.
yaxunl added reviewers: gkistanova, tra, ashi1, Mordante.
yaxunl requested review of this revision.

Recent libc++ changes request clang-11 or gcc-11 to build.

Switch to a bootstrap build step to use built clang to build libc++.


Repository:
  rZORG LLVM Github Zorg

https://reviews.llvm.org/D107868

Files:
  zorg/buildbot/builders/annotated/hip-build.sh


Index: zorg/buildbot/builders/annotated/hip-build.sh
===================================================================
--- zorg/buildbot/builders/annotated/hip-build.sh
+++ zorg/buildbot/builders/annotated/hip-build.sh
@@ -62,7 +62,8 @@
   -DCMAKE_BUILD_TYPE="Release" \
   -DCMAKE_VERBOSE_MAKEFILE=1 \
   -DLLVM_TARGETS_TO_BUILD="AMDGPU;X86" \
-  -DLLVM_ENABLE_PROJECTS="clang;lld;clang-tools-extra;compiler-rt;libcxx;libcxxabi" \
+  -DLLVM_ENABLE_PROJECTS="clang;lld;clang-tools-extra;compiler-rt" \
+  -DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi" \
   -DLIBCXX_ENABLE_SHARED=OFF \
   -DLIBCXX_ENABLE_STATIC=ON \
   -DLIBCXX_INSTALL_LIBRARY=OFF \
@@ -78,10 +79,12 @@
   ${LLVM_ROOT}/llvm
 
 build_step "Building LLVM"
+ninja runtimes                                                      # Build
 ninja
 
 build_step "Install LLVM"
 rm -rf "${DESTDIR}"
+ninja install-runtimes                                              # Install
 ninja install
 
 # Start building llvm-test-suite's hip tests


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D107868.365603.patch
Type: text/x-patch
Size: 995 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20210810/3fcf525e/attachment.bin>