commit 2422a9f359db758fddd2239c8fdbf89f777246e0
author Louis Dionne <ldionne@apple.com> Fri Jun 26 16:05:55 2020 -0400
committer Louis Dionne <ldionne@apple.com> Tue Jul 14 09:52:58 2020 -0400
tree f75c7023af05d0397e29d06838815e476f0429c9
parent e29136f258d1eeaa242c357b7fdd953467cd640e

[libc++] Use a proper CMake target to represent libc++ headers

Instead of having complex logic around how to include the libc++ headers
and __config_site, handle that by defining cxx-headers as an INTERFACE
library and linking against it. After this patch, linking against cxx-headers
is sufficient to get the right __config_site include and include paths
for libc++.

Differential Revision: https://reviews.llvm.org/D82702

Cr-Mirrored-From: https://chromium.googlesource.com/external/github.com/llvm/llvm-project
Cr-Mirrored-Commit: efa40eb194916e1faa32748f097f0cce60dd7d9b

cmake/Modules/DefineLinkerScript.cmake

diff --git a/cmake/Modules/DefineLinkerScript.cmake b/cmake/Modules/DefineLinkerScript.cmake
index 2e68121..11a6ca5 100644
--- a/cmake/Modules/DefineLinkerScript.cmake
+++ b/cmake/Modules/DefineLinkerScript.cmake
@@ -31,6 +31,9 @@
   set(link_libraries)
   if (interface_libs)
     foreach(lib IN LISTS interface_libs)
+      if ("${lib}" STREQUAL "cxx-headers")
+        continue()
+      endif()
       if (TARGET "${lib}" OR
           (${lib} MATCHES "cxxabi(_static|_shared)?" AND HAVE_LIBCXXABI) OR
           (${lib} MATCHES "unwind(_static|_shared)?" AND HAVE_LIBUNWIND))