File tree Expand file tree Collapse file tree 3 files changed +12
-3
lines changed Expand file tree Collapse file tree 3 files changed +12
-3
lines changed Original file line number Diff line number Diff line change @@ -301,7 +301,10 @@ if (LIBCXX_ENABLE_STATIC)
301
301
# then its code shouldn't declare them with hidden visibility. They might
302
302
# actually be provided by a shared library at link time.
303
303
if (LIBCXX_ENABLE_NEW_DELETE_DEFINITIONS )
304
- append_flags_if_supported (CXX_STATIC_LIBRARY_FLAGS -fvisibility-global-new-delete-hidden )
304
+ append_flags_if_supported (CXX_STATIC_LIBRARY_FLAGS -fvisibility-global-new-delete=force-hidden )
305
+ if (NOT CXX_SUPPORTS_FVISIBILITY_GLOBAL_NEW_DELETE_EQ_FORCE_HIDDEN_FLAG )
306
+ append_flags_if_supported (CXX_STATIC_LIBRARY_FLAGS -fvisibility-global-new-delete-hidden )
307
+ endif ()
305
308
endif ()
306
309
target_compile_options (cxx_static PRIVATE ${CXX_STATIC_LIBRARY_FLAGS} )
307
310
# _LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS can be defined in __config_site
Original file line number Diff line number Diff line change @@ -268,7 +268,10 @@ if(LIBCXXABI_HERMETIC_STATIC_LIBRARY)
268
268
# then its code shouldn't declare them with hidden visibility. They might
269
269
# actually be provided by a shared library at link time.
270
270
if (LIBCXXABI_ENABLE_NEW_DELETE_DEFINITIONS )
271
- target_add_compile_flags_if_supported (cxxabi_static_objects PRIVATE -fvisibility-global-new-delete-hidden )
271
+ target_add_compile_flags_if_supported (cxxabi_static_objects PRIVATE -fvisibility-global-new-delete=force-hidden )
272
+ if (NOT CXX_SUPPORTS_FVISIBILITY_GLOBAL_NEW_DELETE_EQ_FORCE_HIDDEN_FLAG )
273
+ target_add_compile_flags_if_supported (cxxabi_static_objects PRIVATE -fvisibility-global-new-delete-hidden )
274
+ endif ()
272
275
endif ()
273
276
# _LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS can be defined in libcxx's
274
277
# __config_site too. Define it in the same way here, to avoid redefinition
Original file line number Diff line number Diff line change @@ -201,7 +201,10 @@ set_target_properties(unwind_static_objects
201
201
202
202
if (LIBUNWIND_HIDE_SYMBOLS )
203
203
target_add_compile_flags_if_supported (unwind_static_objects PRIVATE -fvisibility=hidden )
204
- target_add_compile_flags_if_supported (unwind_static_objects PRIVATE -fvisibility-global-new-delete-hidden )
204
+ target_add_compile_flags_if_supported (unwind_static_objects PRIVATE -fvisibility-global-new-delete=force-hidden )
205
+ if (NOT CXX_SUPPORTS_FVISIBILITY_GLOBAL_NEW_DELETE_EQ_FORCE_HIDDEN_FLAG )
206
+ target_add_compile_flags_if_supported (unwind_static_objects PRIVATE -fvisibility-global-new-delete-hidden )
207
+ endif ()
205
208
target_compile_definitions (unwind_static_objects PRIVATE _LIBUNWIND_HIDE_SYMBOLS )
206
209
endif ()
207
210
You can’t perform that action at this time.
0 commit comments