Skip to content

Commit 5953e5a

Browse files
authored
[libc++] Simplify the apple-system-hardened CI configuration (#126911)
It was basically a copy-paste of the non-hardened version of the same job, and it's easy to remove the duplication.
1 parent dbfb29f commit 5953e5a

File tree

1 file changed

+4
-48
lines changed

1 file changed

+4
-48
lines changed

libcxx/utils/ci/run-buildbot

+4-48
Original file line numberDiff line numberDiff line change
@@ -548,59 +548,15 @@ apple-configuration)
548548
# TODO: It would be better to run the tests against the fake-installed version of libc++ instead
549549
xcrun --sdk macosx ninja -vC "${BUILD_DIR}/${arch}" check-cxx check-cxxabi check-cxx-abilist
550550
;;
551-
apple-system-hardened)
552-
clean
553-
554-
arch="$(uname -m)"
555-
version="$(sw_vers --productVersion)"
556-
params="target_triple=${arch}-apple-macosx${version}"
557-
params+=";hardening_mode=fast"
558-
559-
# In the Apple system configuration, we build libc++ and libunwind separately.
560-
step "Installing libc++ and libc++abi in Apple-system configuration"
561-
${CMAKE} \
562-
-S "${MONOREPO_ROOT}/runtimes" \
563-
-B "${BUILD_DIR}/cxx" \
564-
-GNinja -DCMAKE_MAKE_PROGRAM="${NINJA}" \
565-
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
566-
-DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}/cxx" \
567-
-DLLVM_LIT_ARGS="-sv --xunit-xml-output test-results.xml --timeout=1500 --time-tests" \
568-
-DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi" \
569-
-DLIBCXX_CXX_ABI=libcxxabi \
570-
-C "${MONOREPO_ROOT}/libcxx/cmake/caches/Apple.cmake" \
571-
-DLIBCXX_TEST_CONFIG="apple-libc++-system.cfg.in" \
572-
-DLIBCXXABI_TEST_CONFIG="apple-libc++abi-system.cfg.in" \
573-
-DLIBCXX_TEST_PARAMS="${params}" \
574-
-DLIBCXXABI_TEST_PARAMS="${params}"
575-
576-
step "Installing libunwind in Apple-system configuration"
577-
${CMAKE} \
578-
-S "${MONOREPO_ROOT}/runtimes" \
579-
-B "${BUILD_DIR}/unwind" \
580-
-GNinja -DCMAKE_MAKE_PROGRAM="${NINJA}" \
581-
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
582-
-DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}/unwind" \
583-
-DLLVM_LIT_ARGS="-sv --xunit-xml-output test-results.xml --timeout=1500 --time-tests" \
584-
-DLLVM_ENABLE_RUNTIMES="libunwind" \
585-
-DLIBUNWIND_TEST_CONFIG="apple-libunwind-system.cfg.in" \
586-
-DLIBUNWIND_TEST_PARAMS="${params}" \
587-
-DCMAKE_INSTALL_NAME_DIR="/usr/lib/system"
588-
589-
step "Running the libc++ tests"
590-
${NINJA} -vC "${BUILD_DIR}/cxx" check-cxx
591-
592-
step "Running the libc++abi tests"
593-
${NINJA} -vC "${BUILD_DIR}/cxx" check-cxxabi
594-
595-
step "Running the libunwind tests"
596-
${NINJA} -vC "${BUILD_DIR}/unwind" check-unwind
597-
;;
598-
apple-system)
551+
apple-system|apple-system-hardened)
599552
clean
600553

601554
arch="$(uname -m)"
602555
version="$(sw_vers --productVersion)"
603556
params="target_triple=${arch}-apple-macosx${version}"
557+
if [[ "${BUILDER}" == *-hardened ]]; then
558+
params+=";hardening_mode=fast"
559+
fi
604560

605561
# In the Apple system configuration, we build libc++ and libunwind separately.
606562
step "Installing libc++ and libc++abi in Apple-system configuration"

0 commit comments

Comments
 (0)