[libcxx-commits] [PATCH] D144440: [runtimes][CMake] Drop the check to see if linker works

[Petr Hosek via Phabricator via libcxx-commits]

phosek created this revision.
phosek added a reviewer: mstorsjo.
Herald added a project: All.
phosek requested review of this revision.
Herald added projects: libc++, libc++abi.
Herald added a subscriber: libcxx-commits.
Herald added a reviewer: libc++.
Herald added a reviewer: libc++abi.

This isn't needed anymore.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D144440

Files:
  runtimes/CMakeLists.txt


Index: runtimes/CMakeLists.txt
===================================================================
--- runtimes/CMakeLists.txt
+++ runtimes/CMakeLists.txt
@@ -103,36 +103,31 @@
 filter_prefixed("${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES}" ${LLVM_BINARY_DIR} CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES)
 filter_prefixed("${CMAKE_ASM_IMPLICIT_INCLUDE_DIRECTORIES}" ${LLVM_BINARY_DIR} CMAKE_ASM_IMPLICIT_INCLUDE_DIRECTORIES)
 
-check_c_compiler_flag("" LLVM_RUNTIMES_LINKING_WORKS)
-if (NOT LLVM_RUNTIMES_LINKING_WORKS)
-  # 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.
-  # Don't add this if not necessary to fix linking, as it can break using
-  # e.g. ASAN/TSAN.
-  llvm_check_compiler_linker_flag(C "--unwindlib=none" CXX_SUPPORTS_UNWINDLIB_EQ_NONE_FLAG)
-  if (CXX_SUPPORTS_UNWINDLIB_EQ_NONE_FLAG)
-    set(ORIG_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
-    set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} --unwindlib=none")
-    # TODO: When we can require CMake 3.14, we should use
-    # CMAKE_REQUIRED_LINK_OPTIONS here. Until then, we need a workaround:
-    # When using CMAKE_REQUIRED_FLAGS, this option gets added both to
-    # compilation and linking commands. That causes warnings in the
-    # compilation commands during cmake tests. This is normally benign, but
-    # when testing whether -Werror works, that test fails (due to the
-    # preexisting warning).
-    #
-    # Therefore, before we can use CMAKE_REQUIRED_LINK_OPTIONS, check if we
-    # can use --start-no-unused-arguments to silence the warnings about
-    # --unwindlib=none during compilation.
-    #
-    # We must first add --unwindlib=none to CMAKE_REQUIRED_FLAGS above, to
-    # allow this subsequent test to succeed, then rewrite CMAKE_REQUIRED_FLAGS
-    # below.
-    check_c_compiler_flag("--start-no-unused-arguments" C_SUPPORTS_START_NO_UNUSED_ARGUMENTS)
-    if (C_SUPPORTS_START_NO_UNUSED_ARGUMENTS)
-      set(CMAKE_REQUIRED_FLAGS "${ORIG_CMAKE_REQUIRED_FLAGS} --start-no-unused-arguments --unwindlib=none --end-no-unused-arguments")
-    endif()
+# 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_compiler_linker_flag(C "--unwindlib=none" CXX_SUPPORTS_UNWINDLIB_EQ_NONE_FLAG)
+if (CXX_SUPPORTS_UNWINDLIB_EQ_NONE_FLAG)
+  set(ORIG_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
+  set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} --unwindlib=none")
+  # TODO: When we can require CMake 3.14, we should use
+  # CMAKE_REQUIRED_LINK_OPTIONS here. Until then, we need a workaround:
+  # When using CMAKE_REQUIRED_FLAGS, this option gets added both to
+  # compilation and linking commands. That causes warnings in the
+  # compilation commands during cmake tests. This is normally benign, but
+  # when testing whether -Werror works, that test fails (due to the
+  # preexisting warning).
+  #
+  # Therefore, before we can use CMAKE_REQUIRED_LINK_OPTIONS, check if we
+  # can use --start-no-unused-arguments to silence the warnings about
+  # --unwindlib=none during compilation.
+  #
+  # We must first add --unwindlib=none to CMAKE_REQUIRED_FLAGS above, to
+  # allow this subsequent test to succeed, then rewrite CMAKE_REQUIRED_FLAGS
+  # below.
+  check_c_compiler_flag("--start-no-unused-arguments" C_SUPPORTS_START_NO_UNUSED_ARGUMENTS)
+  if (C_SUPPORTS_START_NO_UNUSED_ARGUMENTS)
+    set(CMAKE_REQUIRED_FLAGS "${ORIG_CMAKE_REQUIRED_FLAGS} --start-no-unused-arguments --unwindlib=none --end-no-unused-arguments")
   endif()
 endif()
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D144440.498981.patch
Type: text/x-patch
Size: 3777 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20230221/fa087a8b/attachment.bin>