[PATCH] D145858: Revert "[CMake] Unify llvm_check_linker_flag and llvm_check_compiler_linker_flag"

[Igor Zhukov via Phabricator via llvm-commits]

fsb4000 created this revision.
fsb4000 added a reviewer: libc++.
fsb4000 added a project: libc++.
Herald added a project: All.
fsb4000 requested review of this revision.
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.

libc++ clang-cl tests failed after that commit

Look at https://buildkite.com/llvm-project/libcxx-ci/builds/20490


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D145858

Files:
  cmake/Modules/LLVMCheckCompilerLinkerFlag.cmake


Index: cmake/Modules/LLVMCheckCompilerLinkerFlag.cmake
===================================================================
--- cmake/Modules/LLVMCheckCompilerLinkerFlag.cmake
+++ cmake/Modules/LLVMCheckCompilerLinkerFlag.cmake
@@ -1,20 +1,28 @@
-include(CheckLinkerFlag OPTIONAL)
+include(CMakePushCheckState)
 
-if (COMMAND check_linker_flag)
-  macro(llvm_check_compiler_linker_flag)
-    check_linker_flag(${ARGN})
-  endmacro()
-else()
-  # Until the minimum CMAKE version is 3.18
+include(CheckCompilerFlag OPTIONAL)
 
+if(NOT COMMAND check_compiler_flag)
+  include(CheckCCompilerFlag)
   include(CheckCXXCompilerFlag)
+endif()
+
+function(llvm_check_compiler_linker_flag lang flag out_var)
+  # If testing a flag with check_c_compiler_flag, it gets added to the compile
+  # command only, but not to the linker command in that test. If the flag
+  # is vital for linking to succeed, the test would fail even if it would
+  # have succeeded if it was included on both commands.
+  #
+  # Therefore, try adding the flag to CMAKE_REQUIRED_FLAGS, which gets
+  # added to both compiling and linking commands in the tests.
 
-  # cmake builtin compatible, except we assume lang is C or CXX
-  function(llvm_check_compiler_linker_flag lang flag out_var)
-    cmake_policy(PUSH)
-    cmake_policy(SET CMP0056 NEW)
-    set(_CMAKE_EXE_LINKER_FLAGS_SAVE ${CMAKE_EXE_LINKER_FLAGS})
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${flag}")
+  cmake_push_check_state()
+  set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${flag}")
+  if(COMMAND check_compiler_flag)
+    check_compiler_flag("${lang}" "" ${out_var})
+  else()
+    # Until the minimum CMAKE version is 3.19
+    # cmake builtin compatible, except we assume lang is C or CXX
     if("${lang}" STREQUAL "C")
       check_c_compiler_flag("" ${out_var})
     elseif("${lang}" STREQUAL "CXX")
@@ -22,7 +30,6 @@
     else()
       message(FATAL_ERROR "\"${lang}\" is not C or CXX")
     endif()
-    set(CMAKE_EXE_LINKER_FLAGS ${_CMAKE_EXE_LINKER_FLAGS_SAVE})
-    cmake_policy(POP)
-  endfunction()
-endif()
+  endif()
+  cmake_pop_check_state()
+endfunction()


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D145858.504403.patch
Type: text/x-patch
Size: 2130 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20230312/674fbdee/attachment.bin>