[llvm] ae2ebc2 - [gn build] Enable builtins on Windows

[Arthur Eubanks via llvm-commits]

Author: Arthur Eubanks
Date: 2023-07-26T18:19:03-07:00
New Revision: ae2ebc24e14586ff65176cb1b4650c7a8c336136

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

LOG: [gn build] Enable builtins on Windows

Added: 
    

Modified: 
    llvm/utils/gn/secondary/compiler-rt/lib/BUILD.gn
    llvm/utils/gn/secondary/compiler-rt/lib/builtins/BUILD.gn

Removed: 
    


################################################################################
diff  --git a/llvm/utils/gn/secondary/compiler-rt/lib/BUILD.gn b/llvm/utils/gn/secondary/compiler-rt/lib/BUILD.gn
index e4606bfa89dc1a..d8c75a01c6945e 100644
--- a/llvm/utils/gn/secondary/compiler-rt/lib/BUILD.gn
+++ b/llvm/utils/gn/secondary/compiler-rt/lib/BUILD.gn
@@ -1,6 +1,7 @@
 group("lib") {
   deps = [
     "//compiler-rt/lib/asan:ignorelist($host_toolchain)",
+    "//compiler-rt/lib/builtins",
     "//compiler-rt/lib/cfi:ignorelist($host_toolchain)",
   ]
   if (current_os == "linux") {
@@ -18,9 +19,6 @@ group("lib") {
       deps += [ "//compiler-rt/lib/tsan/rtl" ]
     }
   }
-  if (current_os != "win") {
-    deps += [ "//compiler-rt/lib/builtins" ]
-  }
   if (current_os != "baremetal") {
     deps += [ "//compiler-rt/lib/profile" ]
   }

diff  --git a/llvm/utils/gn/secondary/compiler-rt/lib/builtins/BUILD.gn b/llvm/utils/gn/secondary/compiler-rt/lib/builtins/BUILD.gn
index 7164e1091cb3e4..e1ca9482af143f 100644
--- a/llvm/utils/gn/secondary/compiler-rt/lib/builtins/BUILD.gn
+++ b/llvm/utils/gn/secondary/compiler-rt/lib/builtins/BUILD.gn
@@ -69,17 +69,20 @@ static_library("builtins") {
   complete_static_lib = true
   configs -= [ "//llvm/utils/gn/build:thin_archive" ]
 
-  cflags = [
-    "-fPIC",
-    "-fno-builtin",
-  ]
-  if (current_os != "android") {
-    cflags += [ "-fvisibility=hidden" ]
-  }
-  if (!is_debug) {
-    cflags += [ "-fomit-frame-pointer" ]
+  cflags = []
+  if (current_os != "win") {
+    cflags = [
+      "-fPIC",
+      "-fno-builtin",
+    ]
+    if (current_os != "android") {
+      cflags += [ "-fvisibility=hidden" ]
+    }
+    if (!is_debug) {
+      cflags += [ "-fomit-frame-pointer" ]
+    }
+    cflags_c = [ "-std=c11" ]
   }
-  cflags_c = [ "-std=c11" ]
 
   sources = [
     "absvdi2.c",