[𝘀𝗽𝗿] initial versionupstream/users/pcc/spr/gn-build-embed-libcabia-objects-into-libca

Created using spr 1.3.6-beta.1

3 files changed, 29 insertions, 25 deletions

diff --git a/llvm/utils/gn/secondary/libcxx/src/BUILD.gn b/llvm/utils/gn/secondary/libcxx/src/BUILD.gn
index 5da8db4574a0..f60653a02fb3 100644
--- a/llvm/utils/gn/secondary/libcxx/src/BUILD.gn
+++ b/llvm/utils/gn/secondary/libcxx/src/BUILD.gn
@@ -290,14 +290,14 @@ if (libcxx_enable_static) {
     if (libcxx_hermetic_static_library) {
       cflags = [ "-fvisibility=hidden" ]
       if (libcxx_enable_new_delete_definitions) {
-        cflags_cc = [ "-fvisibility-global-new-delete-hidden" ]
+        cflags_cc = [ "-fvisibility-global-new-delete=force-hidden" ]
       }
       defines = [ "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS" ]
     }
     deps = [
       "//compiler-rt/lib/builtins",
       "//libcxx/include",
-      "//libcxxabi/src:cxxabi_static",
+      "//libcxxabi/src:sources",
       "//libunwind/src:unwind_static",
     ]
     configs += [ ":cxx_config" ]
diff --git a/llvm/utils/gn/secondary/libcxxabi/src/BUILD.gn b/llvm/utils/gn/secondary/libcxxabi/src/BUILD.gn
index c82634e2bb06..e8a76bf2fb8d 100644
--- a/llvm/utils/gn/secondary/libcxxabi/src/BUILD.gn
+++ b/llvm/utils/gn/secondary/libcxxabi/src/BUILD.gn
@@ -105,34 +105,38 @@ if (libcxxabi_enable_shared) {
   }
 }
 
+source_set("sources") {
+  sources = cxxabi_sources
+  public = cxxabi_headers
+  if (libcxxabi_hermetic_static_library) {
+    cflags = [ "-fvisibility=hidden" ]
+    if (libcxxabi_enable_new_delete_definitions) {
+      cflags_cc = [ "-fvisibility-global-new-delete=force-hidden" ]
+    }
+    defines = [
+      "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
+      "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
+    ]
+  }
+  deps = [
+    "//compiler-rt/lib/builtins",
+    "//libcxx/include",
+    "//libunwind/src:unwind_static",
+  ]
+  configs += [ ":cxxabi_config" ]
+  configs -= [
+    "//llvm/utils/gn/build:no_exceptions",
+    "//llvm/utils/gn/build:no_rtti",
+  ]
+}
+
 if (libcxxabi_enable_static) {
   static_library("cxxabi_static") {
     output_dir = runtimes_dir
     output_name = "c++abi"
     complete_static_lib = true
     configs -= [ "//llvm/utils/gn/build:thin_archive" ]
-    sources = cxxabi_sources
-    public = cxxabi_headers
-    if (libcxxabi_hermetic_static_library) {
-      cflags = [ "-fvisibility=hidden" ]
-      if (libcxxabi_enable_new_delete_definitions) {
-        cflags_cc = [ "-fvisibility-global-new-delete-hidden" ]
-      }
-      defines = [
-        "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
-        "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
-      ]
-    }
-    deps = [
-      "//compiler-rt/lib/builtins",
-      "//libcxx/include",
-      "//libunwind/src:unwind_static",
-    ]
-    configs += [ ":cxxabi_config" ]
-    configs -= [
-      "//llvm/utils/gn/build:no_exceptions",
-      "//llvm/utils/gn/build:no_rtti",
-    ]
+    deps = [ ":sources" ]
   }
 }
 
diff --git a/llvm/utils/gn/secondary/libunwind/src/BUILD.gn b/llvm/utils/gn/secondary/libunwind/src/BUILD.gn
index ea95b1d64fdd..2396300f9471 100644
--- a/llvm/utils/gn/secondary/libunwind/src/BUILD.gn
+++ b/llvm/utils/gn/secondary/libunwind/src/BUILD.gn
@@ -119,7 +119,7 @@ if (libunwind_enable_static) {
       public = unwind_headers
       if (!invoker.export) {
         cflags = [ "-fvisibility=hidden" ]
-        cflags_cc = [ "-fvisibility-global-new-delete-hidden" ]
+        cflags_cc = [ "-fvisibility-global-new-delete=force-hidden" ]
         defines = [ "_LIBUNWIND_HIDE_SYMBOLS" ]
       }
       deps = [ "//compiler-rt/lib/builtins" ]