Index: zorg/buildbot/builders/annotated/hip-build.sh
===================================================================
--- zorg/buildbot/builders/annotated/hip-build.sh
+++ zorg/buildbot/builders/annotated/hip-build.sh
@@ -62,28 +62,21 @@
   -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" \
-  -DLIBCXX_ENABLE_SHARED=OFF \
-  -DLIBCXX_ENABLE_STATIC=ON \
-  -DLIBCXX_INSTALL_LIBRARY=OFF \
-  -DLIBCXX_INSTALL_HEADERS=OFF \
-  -DLIBCXXABI_ENABLE_SHARED=OFF \
-  -DLIBCXXABI_ENABLE_STATIC=ON \
-  -DLIBCXXABI_INSTALL_STATIC_LIBRARY=OFF \
+  -DLLVM_ENABLE_PROJECTS="clang;lld;clang-tools-extra;compiler-rt" \
   -DCMAKE_INSTALL_PREFIX="${DESTDIR}" \
   -DLLVM_ENABLE_ASSERTIONS=ON \
   -DLLVM_ENABLE_Z3_SOLVER=OFF \
   -DLLVM_ENABLE_ZLIB=ON \
   -DLLVM_LIT_ARGS="-v -vv" \
   ${LLVM_ROOT}/llvm

 build_step "Building LLVM"
 ninja

 build_step "Install LLVM"
 rm -rf "${DESTDIR}"
 ninja install

 # Start building llvm-test-suite's hip tests
 build_step "Configuring HIP test-suite"
 TEST_BUILD_DIR=${BUILD_DIR}/test-suite-build