[PATCH] D113606: [gn build] Fix Android compiler-rt targets

[Arthur Eubanks via Phabricator via llvm-commits]

aeubanks created this revision.
aeubanks added a reviewer: thakis.
Herald added subscribers: danielkiss, dberris.
aeubanks requested review of this revision.
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.

If a sysroot was specified, it would take precedence over the Android
NDK sysroot since it would appear after in the command line.

Also only build runtimes for enabled target arches.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D113606

Files:
  llvm/utils/gn/build/BUILD.gn
  llvm/utils/gn/secondary/compiler-rt/BUILD.gn


Index: llvm/utils/gn/secondary/compiler-rt/BUILD.gn
===================================================================
--- llvm/utils/gn/secondary/compiler-rt/BUILD.gn
+++ 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)" ]
Index: llvm/utils/gn/build/BUILD.gn
===================================================================
--- llvm/utils/gn/build/BUILD.gn
+++ 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") {


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D113606.386291.patch
Type: text/x-patch
Size: 1528 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20211110/33da27d9/attachment.bin>