diff options
author | Petr Hosek <phosek@google.com> | 2023-02-22 17:32:07 +0000 |
---|---|---|
committer | Petr Hosek <phosek@google.com> | 2023-02-22 17:32:07 +0000 |
commit | 24d144571dbffc6993d13fb7ca781248eed024de (patch) | |
tree | 85bbc61aaa94f8c7654711dad841a0eb5be26570 /libunwind | |
parent | 944f429b210d0d94171dc5df3068d4f1e8fb5d80 (diff) | |
download | llvm-24d144571dbffc6993d13fb7ca781248eed024de.zip llvm-24d144571dbffc6993d13fb7ca781248eed024de.tar.gz llvm-24d144571dbffc6993d13fb7ca781248eed024de.tar.bz2 |
Revert "[CMake] Unify llvm_check_linker_flag and llvm_check_compiler_linker_flag"
This reverts commit efae3174f09560353fb0f3d528bcbffe060d5438 since
it broke the standalone Flang build.
Diffstat (limited to 'libunwind')
-rw-r--r-- | libunwind/cmake/config-ix.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libunwind/cmake/config-ix.cmake b/libunwind/cmake/config-ix.cmake index ae6caeb..d311477 100644 --- a/libunwind/cmake/config-ix.cmake +++ b/libunwind/cmake/config-ix.cmake @@ -2,14 +2,14 @@ include(CMakePushCheckState) include(CheckCCompilerFlag) include(CheckCXXCompilerFlag) include(CheckLibraryExists) -include(LLVMCheckLinkerFlag) +include(LLVMCheckCompilerLinkerFlag) include(CheckSymbolExists) include(CheckCSourceCompiles) # The compiler driver may be implicitly trying to link against libunwind, which # might not work if libunwind doesn't exist yet. Try to check if # --unwindlib=none is supported, and use that if possible. -llvm_check_linker_flag(C "--unwindlib=none" CXX_SUPPORTS_UNWINDLIB_EQ_NONE_FLAG) +llvm_check_compiler_linker_flag(C "--unwindlib=none" CXX_SUPPORTS_UNWINDLIB_EQ_NONE_FLAG) check_library_exists(c fopen "" LIBUNWIND_HAS_C_LIB) @@ -31,11 +31,11 @@ endif() # required for the link to go through. We remove sanitizers from the # configuration checks to avoid spurious link errors. -llvm_check_linker_flag(CXX "-nostdlib++" CXX_SUPPORTS_NOSTDLIBXX_FLAG) +llvm_check_compiler_linker_flag(CXX "-nostdlib++" CXX_SUPPORTS_NOSTDLIBXX_FLAG) if (CXX_SUPPORTS_NOSTDLIBXX_FLAG) set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -nostdlib++") else() - llvm_check_linker_flag(C "-nodefaultlibs" C_SUPPORTS_NODEFAULTLIBS_FLAG) + llvm_check_compiler_linker_flag(C "-nodefaultlibs" C_SUPPORTS_NODEFAULTLIBS_FLAG) if (C_SUPPORTS_NODEFAULTLIBS_FLAG) set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -nodefaultlibs") endif() |