diff options
| author | Petr Hosek <phosek@google.com> | 2022-01-21 09:53:14 -0800 |
|---|---|---|
| committer | Petr Hosek <phosek@google.com> | 2022-01-21 09:53:14 -0800 |
| commit | 10e5c513b59bff0a049cc2a24bb7d41cd874ad7a (patch) | |
| tree | bf1ed214c3833b9c0d0d54c428a5077e9524c366 /runtimes | |
| parent | 26cbc430197a3432075c7c5dfec41765f92b97ed (diff) | |
| download | llvm-10e5c513b59bff0a049cc2a24bb7d41cd874ad7a.tar.gz | |
Revert "[cmake] Duplicate `{llvm,compiler_rt}_check_linker_flag` for runtime libs and llvm"
This reverts commit 4af11272f57a4a6fed2932e9e0857b2c1a707c51.
Diffstat (limited to 'runtimes')
| -rw-r--r-- | runtimes/CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/runtimes/CMakeLists.txt b/runtimes/CMakeLists.txt index 1a50d9e8c98b..cedce7b3541e 100644 --- a/runtimes/CMakeLists.txt +++ b/runtimes/CMakeLists.txt @@ -88,7 +88,7 @@ set(LLVM_CMAKE_DIR ${LLVM_MAIN_SRC_DIR}/cmake/modules) set(LLVM_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../llvm) include(CheckLibraryExists) -include(LLVMCheckLinkerFlag) # Compat until CMake 3.18 +include(CheckLinkerFlag) include(CheckCCompilerFlag) include(CheckCXXCompilerFlag) @@ -100,7 +100,7 @@ if (NOT LLVM_RUNTIMES_LINKING_WORKS) # --unwindlib=none is supported, and use that if possible. # Don't add this if not necessary to fix linking, as it can break using # e.g. ASAN/TSAN. - llvm_check_linker_flag(C "--unwindlib=none" LLVM_RUNTIMES_SUPPORT_UNWINDLIB_NONE_FLAG) + llvm_check_linker_flag("--unwindlib=none" LLVM_RUNTIMES_SUPPORT_UNWINDLIB_NONE_FLAG) if (LLVM_RUNTIMES_SUPPORT_UNWINDLIB_NONE_FLAG) set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} --unwindlib=none") endif() @@ -110,7 +110,7 @@ endif() # Check for -nostdlib++ first; if there's no C++ standard library yet, # all check_cxx_compiler_flag commands will fail until we add -nostdlib++ # (or -nodefaultlibs). -llvm_check_linker_flag(C "-nostdlib++" LLVM_RUNTIMES_SUPPORT_NOSTDLIBXX_FLAG) +llvm_check_linker_flag(-nostdlib++ LLVM_RUNTIMES_SUPPORT_NOSTDLIBXX_FLAG) if (LLVM_RUNTIMES_SUPPORT_NOSTDLIBXX_FLAG) set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -nostdlib++") endif() |