[libcxx-commits] [libcxx] [libc++] Fix CMake cache for the hardening with ABI breaks CI (PR #105864)

Louis Dionne via libcxx-commits libcxx-commits at lists.llvm.org
Fri Aug 23 10:37:13 PDT 2024


https://github.com/ldionne created https://github.com/llvm/llvm-project/pull/105864

We were incorrectly only enabling _LIBCPP_ABI_BOUNDED_ITERATORS, without enabling bounded iterators in string and vector.

>From c21a7c0a1eb464f11cf695d31acff8e7b71a0bde Mon Sep 17 00:00:00 2001
From: Louis Dionne <ldionne.2 at gmail.com>
Date: Fri, 23 Aug 2024 13:35:47 -0400
Subject: [PATCH] [libc++] Fix CMake cache for the hardening with ABI breaks CI

We were incorrectly only enabling _LIBCPP_ABI_BOUNDED_ITERATORS,
without enabling bounded iterators in string and vector.
---
 .../caches/Generic-hardening-mode-fast-with-abi-breaks.cmake  | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/libcxx/cmake/caches/Generic-hardening-mode-fast-with-abi-breaks.cmake b/libcxx/cmake/caches/Generic-hardening-mode-fast-with-abi-breaks.cmake
index 4a9389fdcb41cb..c0f2bad1c95af0 100644
--- a/libcxx/cmake/caches/Generic-hardening-mode-fast-with-abi-breaks.cmake
+++ b/libcxx/cmake/caches/Generic-hardening-mode-fast-with-abi-breaks.cmake
@@ -1,4 +1,2 @@
 set(LIBCXX_HARDENING_MODE "fast" CACHE STRING "")
-set(LIBCXX_ABI_DEFINES "_LIBCPP_ABI_BOUNDED_ITERATORS" CACHE STRING "")
-set(LIBCXX_ABI_DEFINES "_LIBCPP_ABI_BOUNDED_ITERATORS_IN_STRING" CACHE STRING "")
-set(LIBCXX_ABI_DEFINES "_LIBCPP_ABI_BOUNDED_ITERATORS_IN_VECTOR" CACHE STRING "")
+set(LIBCXX_ABI_DEFINES "_LIBCPP_ABI_BOUNDED_ITERATORS;_LIBCPP_ABI_BOUNDED_ITERATORS_IN_STRING;_LIBCPP_ABI_BOUNDED_ITERATORS_IN_VECTOR" CACHE STRING "")



More information about the libcxx-commits mailing list