Skip to content

Commit 8e3aa7e

Browse files
authored
[libc++] Fix CMake cache for the hardening with ABI breaks CI (#105864)
We were incorrectly only enabling _LIBCPP_ABI_BOUNDED_ITERATORS, without enabling bounded iterators in string and vector.
1 parent 7134d2e commit 8e3aa7e

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed
Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
11
set(LIBCXX_HARDENING_MODE "fast" CACHE STRING "")
2-
set(LIBCXX_ABI_DEFINES "_LIBCPP_ABI_BOUNDED_ITERATORS" CACHE STRING "")
3-
set(LIBCXX_ABI_DEFINES "_LIBCPP_ABI_BOUNDED_ITERATORS_IN_STRING" CACHE STRING "")
4-
set(LIBCXX_ABI_DEFINES "_LIBCPP_ABI_BOUNDED_ITERATORS_IN_VECTOR" CACHE STRING "")
2+
set(LIBCXX_ABI_DEFINES "_LIBCPP_ABI_BOUNDED_ITERATORS;_LIBCPP_ABI_BOUNDED_ITERATORS_IN_STRING;_LIBCPP_ABI_BOUNDED_ITERATORS_IN_VECTOR" CACHE STRING "")

libcxx/utils/ci/run-buildbot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ generic-hardening-mode-fast-with-abi-breaks)
417417
clean
418418
generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-hardening-mode-fast-with-abi-breaks.cmake"
419419
check-runtimes
420-
check-abi-list
420+
# Not checking ABI list since we purposefully enable ABI breaking changes
421421
;;
422422
generic-hardening-mode-extensive)
423423
clean

0 commit comments

Comments
 (0)