[libcxx-commits] [PATCH] D69874: Setting linker language for libunwind and libc++

[Puyan Lotfi via Phabricator via libcxx-commits]

plotfi created this revision.
plotfi added a reviewer: compnerd.
Herald added subscribers: libcxx-commits, ldionne, christof, mgorny.
Herald added a reviewer: EricWF.
Herald added a project: libc++.

LINKER_LANGUAGE needs to be set to C, drops Wl flags.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D69874

Files:
  libcxx/src/CMakeLists.txt
  libunwind/src/CMakeLists.txt


Index: libunwind/src/CMakeLists.txt
===================================================================
--- libunwind/src/CMakeLists.txt
+++ libunwind/src/CMakeLists.txt
@@ -127,12 +127,15 @@
                             "${LIBUNWIND_COMPILE_FLAGS}"
                           LINK_FLAGS
                             "${LIBUNWIND_LINK_FLAGS}"
+                          LINKER_LANGUAGE
+                            C
                           OUTPUT_NAME
                             "unwind"
                           VERSION
                             "1.0"
                           SOVERSION
                             "1")
+  string(REPLACE "-Wl,-z,defs" "" CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
   list(APPEND LIBUNWIND_BUILD_TARGETS "unwind_shared")
   if (LIBUNWIND_INSTALL_SHARED_LIBRARY)
     list(APPEND LIBUNWIND_INSTALL_TARGETS "unwind_shared")
Index: libcxx/src/CMakeLists.txt
===================================================================
--- libcxx/src/CMakeLists.txt
+++ libcxx/src/CMakeLists.txt
@@ -165,6 +165,7 @@
     PROPERTIES
       COMPILE_FLAGS "${LIBCXX_COMPILE_FLAGS}"
       LINK_FLAGS    "${LIBCXX_LINK_FLAGS}"
+      LINKER_LANGUAGE C
       OUTPUT_NAME   "c++"
       VERSION       "${LIBCXX_ABI_VERSION}.0"
       SOVERSION     "${LIBCXX_ABI_VERSION}"


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D69874.227990.patch
Type: text/x-patch
Size: 1317 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20191106/c6f4cae6/attachment.bin>