diff options
| author | Nikolas Klauser <nikolasklauser@berlin.de> | 2023-02-20 16:47:34 +0100 |
|---|---|---|
| committer | Nikolas Klauser <nikolasklauser@berlin.de> | 2023-02-21 13:16:44 +0100 |
| commit | d0e95fec65b7ac68021e956a3da74aa8d42e699f (patch) | |
| tree | 84615a69bfb7b6ff88a15fc8c7a05fbce7b3facf /libcxxabi | |
| parent | 0af67d167d6c811abf12ad6c27ee34ec1365e5fb (diff) | |
| download | llvm-d0e95fec65b7ac68021e956a3da74aa8d42e699f.tar.gz | |
[runtimes] Remove add_target_flags* functions and use add_flags* instead
Reviewed By: phosek, #libunwind, #libc, #libc_abi
Spies: libcxx-commits
Differential Revision: https://reviews.llvm.org/D144398
Diffstat (limited to 'libcxxabi')
| -rw-r--r-- | libcxxabi/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | libcxxabi/cmake/Modules/HandleLibcxxabiFlags.cmake | 31 |
2 files changed, 2 insertions, 33 deletions
diff --git a/libcxxabi/CMakeLists.txt b/libcxxabi/CMakeLists.txt index a92ada7cb96c..120d31677b56 100644 --- a/libcxxabi/CMakeLists.txt +++ b/libcxxabi/CMakeLists.txt @@ -246,11 +246,11 @@ include(HandleLibcxxabiFlags) # Configure target flags if(ZOS) - add_target_flags_if_supported("-fzos-le-char-mode=ebcdic") + add_flags_if_supported("-fzos-le-char-mode=ebcdic") endif() if (${CMAKE_SYSTEM_NAME} MATCHES "AIX") - add_target_flags_if_supported("-mdefault-visibility-export-mapping=explicit") + add_flags_if_supported("-mdefault-visibility-export-mapping=explicit") set(CMAKE_AIX_EXPORT_ALL_SYMBOLS OFF) endif() add_compile_flags("${LIBCXXABI_ADDITIONAL_COMPILE_FLAGS}") diff --git a/libcxxabi/cmake/Modules/HandleLibcxxabiFlags.cmake b/libcxxabi/cmake/Modules/HandleLibcxxabiFlags.cmake index 976c6b52bac6..16aed0242a6d 100644 --- a/libcxxabi/cmake/Modules/HandleLibcxxabiFlags.cmake +++ b/libcxxabi/cmake/Modules/HandleLibcxxabiFlags.cmake @@ -9,37 +9,6 @@ include(HandleFlags) unset(add_flag_if_supported) -# Add a list of flags to all of 'CMAKE_CXX_FLAGS', 'CMAKE_C_FLAGS', -# 'LIBCXXABI_COMPILE_FLAGS' and 'LIBCXXABI_LINK_FLAGS'. -macro(add_target_flags) - foreach(value ${ARGN}) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${value}") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${value}") - list(APPEND LIBCXXABI_COMPILE_FLAGS ${value}) - list(APPEND LIBCXXABI_LINK_FLAGS ${value}) - endforeach() -endmacro() - -# If the specified 'condition' is true then add a list of flags to -# all of 'CMAKE_CXX_FLAGS', 'CMAKE_C_FLAGS', 'LIBCXXABI_COMPILE_FLAGS' -# and 'LIBCXXABI_LINK_FLAGS'. -macro(add_target_flags_if condition) - if (${condition}) - add_target_flags(${ARGN}) - endif() -endmacro() - -# Add all the flags supported by the compiler to all of -# 'CMAKE_CXX_FLAGS', 'CMAKE_C_FLAGS', 'LIBCXXABI_COMPILE_FLAGS' -# and 'LIBCXXABI_LINK_FLAGS'. -macro(add_target_flags_if_supported) - foreach(flag ${ARGN}) - mangle_name("${flag}" flagname) - check_cxx_compiler_flag("${flag}" "CXX_SUPPORTS_${flagname}_FLAG") - add_target_flags_if(CXX_SUPPORTS_${flagname}_FLAG ${flag}) - endforeach() -endmacro() - # Add a specified list of flags to both 'LIBCXXABI_COMPILE_FLAGS' and # 'LIBCXXABI_LINK_FLAGS'. macro(add_flags) |