diff --git a/llvm/utils/gn/build/BUILD.gn b/llvm/utils/gn/build/BUILD.gn
--- a/llvm/utils/gn/build/BUILD.gn
+++ b/llvm/utils/gn/build/BUILD.gn
@@ -40,10 +40,10 @@
     defines += [ "EXPENSIVE_CHECKS" ]
   }
 
-  asmflags = target_flags
-  cflags = target_flags
+  asmflags = []
+  cflags = []
   cflags_cc = []
-  ldflags = target_flags + target_ldflags
+  ldflags = []
 
   # Mostly for compiler-rt, see compiler-rt/cmake/config-ix.cmake
   if (current_os == "ios") {
@@ -345,6 +345,10 @@
   }
 
   cflags_objcc = cflags_cc
+
+  asmflags += target_flags
+  cflags += target_flags
+  ldflags += target_flags + target_ldflags
 }
 
 config("no_exceptions") {
diff --git a/llvm/utils/gn/secondary/compiler-rt/BUILD.gn b/llvm/utils/gn/secondary/compiler-rt/BUILD.gn
--- a/llvm/utils/gn/secondary/compiler-rt/BUILD.gn
+++ b/llvm/utils/gn/secondary/compiler-rt/BUILD.gn
@@ -12,10 +12,14 @@
   supported_toolchains = [ "//llvm/utils/gn/build/toolchain:stage2_unix" ]
 }
 if (android_ndk_path != "") {
-  supported_toolchains += [
-    "//llvm/utils/gn/build/toolchain:stage2_android_aarch64",
-    "//llvm/utils/gn/build/toolchain:stage2_android_arm",
-  ]
+  if (llvm_build_AArch64) {
+    supported_toolchains +=
+        [ "//llvm/utils/gn/build/toolchain:stage2_android_aarch64" ]
+  }
+  if (llvm_build_ARM) {
+    supported_toolchains +=
+        [ "//llvm/utils/gn/build/toolchain:stage2_android_arm" ]
+  }
 }
 group("compiler-rt") {
   deps = [ "//compiler-rt/include($host_toolchain)" ]