[llvm] d4071b2 - [gn build] Try to fix win build after cfe02847496b856aa

Nico Weber via llvm-commits llvm-commits at lists.llvm.org
Tue Sep 7 13:59:15 PDT 2021


Author: Nico Weber
Date: 2021-09-07T16:58:57-04:00
New Revision: d4071b2777f372719c752a0fea560b7bf7319e5b

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

LOG: [gn build] Try to fix win build after cfe02847496b856aa

Added: 
    

Modified: 
    llvm/utils/gn/build/BUILD.gn

Removed: 
    


################################################################################
diff  --git a/llvm/utils/gn/build/BUILD.gn b/llvm/utils/gn/build/BUILD.gn
index 9ceed1d8ef856..bbd7a16b2a68a 100644
--- a/llvm/utils/gn/build/BUILD.gn
+++ b/llvm/utils/gn/build/BUILD.gn
@@ -41,6 +41,7 @@ config("compiler_defaults") {
 
   asmflags = target_flags
   cflags = target_flags
+  cflags_cc = []
   ldflags = target_flags + target_ldflags
 
   # Mostly for compiler-rt, see compiler-rt/cmake/config-ix.cmake
@@ -86,7 +87,7 @@ config("compiler_defaults") {
     if (use_lld) {
       ldflags += [ "-Wl,--color-diagnostics" ]
     }
-    cflags_cc = [
+    cflags_cc += [
       "-std=c++14",
       "-fvisibility-inlines-hidden",
     ]
@@ -353,8 +354,9 @@ config("compiler_defaults") {
 }
 
 config("no_exceptions") {
+  cflags_cc = []
   if (host_os != "win") {
-    cflags_cc = [ "-fno-exceptions" ]
+    cflags_cc += [ "-fno-exceptions" ]
   }
   cflags_objcc = cflags_cc
 }


        


More information about the llvm-commits mailing list