Skip to content

Commit 18b575d

Browse files
authored
[libc++abi] Fixing up LIBCXXABI_ADDITIONAL_COMPILE_FLAGS (#97608)
This is the continuation of #96112 which implements proposal from Louis. Using PRIVATE option on target_compile_options() fixes the issue of propagating the option into lib++.
1 parent ac76ce2 commit 18b575d

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

libcxxabi/src/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ set_target_properties(cxxabi_shared_objects
182182
if (CMAKE_POSITION_INDEPENDENT_CODE OR NOT DEFINED CMAKE_POSITION_INDEPENDENT_CODE)
183183
set_target_properties(cxxabi_shared_objects PROPERTIES POSITION_INDEPENDENT_CODE ON) # must set manually because it's an object library
184184
endif()
185-
target_compile_options(cxxabi_shared_objects PUBLIC "${LIBCXXABI_ADDITIONAL_COMPILE_FLAGS}")
185+
target_compile_options(cxxabi_shared_objects PRIVATE "${LIBCXXABI_ADDITIONAL_COMPILE_FLAGS}")
186186

187187
if (LIBCXXABI_ENABLE_SHARED)
188188
add_library(cxxabi_shared SHARED)
@@ -262,7 +262,7 @@ set_target_properties(cxxabi_static_objects
262262
CXX_STANDARD_REQUIRED OFF # TODO: Make this REQUIRED once we don't need to accommodate the LLVM documentation builders using an ancient CMake
263263
COMPILE_FLAGS "${LIBCXXABI_COMPILE_FLAGS}"
264264
)
265-
target_compile_options(cxxabi_static_objects PUBLIC "${LIBCXXABI_ADDITIONAL_COMPILE_FLAGS}")
265+
target_compile_options(cxxabi_static_objects PRIVATE "${LIBCXXABI_ADDITIONAL_COMPILE_FLAGS}")
266266

267267
if(LIBCXXABI_HERMETIC_STATIC_LIBRARY)
268268
target_add_compile_flags_if_supported(cxxabi_static_objects PRIVATE -fvisibility=hidden)

0 commit comments

Comments
 (0)