[llvm] 2759041 - [gn build] (manually) merge a whole bunch of libc++ header files

[Nico Weber via llvm-commits]

Author: Nico Weber
Date: 2021-01-07T22:09:35-05:00
New Revision: 2759041786e4fe0dfb3b4fe9a3107395be738b95

URL: https://github.com/llvm/llvm-project/commit/2759041786e4fe0dfb3b4fe9a3107395be738b95
DIFF: https://github.com/llvm/llvm-project/commit/2759041786e4fe0dfb3b4fe9a3107395be738b95.diff

LOG: [gn build] (manually) merge a whole bunch of libc++ header files

I noticed __availability was missing, so I manually diffed the
file lists and put all recently(ish) added headers:
* __availability from 2eadbc86142ba
* concepts from 601f7631827ae
* execution from 0a06eb911b830
* numbers from 4f6c4b473c4a5

Also remove libcxx_install_support_headers like the CMake build did in
6706342f48bea, and unconditionally copy
support/win32/{limits_msvc_win32.h,locale_win32.h} like the CMake
build always did as far as I can tell.

Added: 
    

Modified: 
    llvm/utils/gn/secondary/libcxx/include/BUILD.gn

Removed: 
    


################################################################################
diff  --git a/llvm/utils/gn/secondary/libcxx/include/BUILD.gn b/llvm/utils/gn/secondary/libcxx/include/BUILD.gn
index ac217956886a..64253c6e72df 100644
--- a/llvm/utils/gn/secondary/libcxx/include/BUILD.gn
+++ b/llvm/utils/gn/secondary/libcxx/include/BUILD.gn
@@ -2,11 +2,6 @@ import("//clang/resource_dir.gni")
 import("//libcxx/config.gni")
 import("//llvm/utils/gn/build/write_cmake_config.gni")
 
-declare_args() {
-  # Install libc++ support headers.
-  libcxx_install_support_headers = true
-}
-
 libcxx_needs_site_config =
     libcxx_abi_version != 1 || libcxx_abi_namespace != "" || libcxx_abi_unstable
 
@@ -54,6 +49,7 @@ if (libcxx_needs_site_config) {
 
 copy("include") {
   sources = [
+    "__availability",
     "__bit_reference",
     "__bsd_locale_defaults.h",
     "__bsd_locale_fallbacks.h",
@@ -104,6 +100,7 @@ copy("include") {
     "compare",
     "complex",
     "complex.h",
+    "concepts",
     "condition_variable",
     "csetjmp",
     "csignal",
@@ -122,6 +119,7 @@ copy("include") {
     "deque",
     "errno.h",
     "exception",
+    "execution",
     "experimental/__config",
     "experimental/__memory",
     "experimental/algorithm",
@@ -174,6 +172,7 @@ copy("include") {
     "module.modulemap",
     "mutex",
     "new",
+    "numbers",
     "numeric",
     "optional",
     "ostream",
@@ -200,6 +199,24 @@ copy("include") {
     "string.h",
     "string_view",
     "strstream",
+    "support/android/locale_bionic.h",
+    "support/fuchsia/xlocale.h",
+    "support/ibm/limits.h",
+    "support/ibm/locale_mgmt_aix.h",
+    "support/ibm/nanosleep.h",
+    "support/ibm/support.h",
+    "support/ibm/xlocale.h",
+    "support/musl/xlocale.h",
+    "support/newlib/xlocale.h",
+    "support/nuttx/xlocale.h",
+    "support/solaris/floatingpoint.h",
+    "support/solaris/wchar.h",
+    "support/solaris/xlocale.h",
+    "support/win32/limits_msvc_win32.h",
+    "support/win32/locale_win32.h",
+    "support/xlocale/__nop_locale_mgmt.h",
+    "support/xlocale/__posix_l_fallback.h",
+    "support/xlocale/__strtonum_fallback.h",
     "system_error",
     "tgmath.h",
     "thread",
@@ -234,31 +251,5 @@ copy("include") {
   } else {
     deps += [ ":copy_config" ]
   }
-  if (libcxx_install_support_headers) {
-    sources += [
-      "support/android/locale_bionic.h",
-      "support/fuchsia/xlocale.h",
-      "support/ibm/limits.h",
-      "support/ibm/locale_mgmt_aix.h",
-      "support/ibm/nanosleep.h",
-      "support/ibm/support.h",
-      "support/ibm/xlocale.h",
-      "support/musl/xlocale.h",
-      "support/newlib/xlocale.h",
-      "support/nuttx/xlocale.h",
-      "support/solaris/floatingpoint.h",
-      "support/solaris/wchar.h",
-      "support/solaris/xlocale.h",
-      "support/xlocale/__nop_locale_mgmt.h",
-      "support/xlocale/__posix_l_fallback.h",
-      "support/xlocale/__strtonum_fallback.h",
-    ]
-    if (target_os == "win") {
-      sources += [
-        "support/win32/limits_msvc_win32.h",
-        "support/win32/locale_win32.h",
-      ]
-    }
-  }
   outputs = [ "$root_build_dir/include/c++/v1/{{source_target_relative}}" ]
 }