[PATCH] D157901: [gn build] Force clang_enable_per_target_runtime_dir for Android builds

[Arthur Eubanks via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rG204161193156: [gn build] Force clang_enable_per_target_runtime_dir for Android builds (authored by aeubanks).

Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D157901/new/

https://reviews.llvm.org/D157901

Files:
  llvm/utils/gn/build/toolchain/BUILD.gn


Index: llvm/utils/gn/build/toolchain/BUILD.gn
===================================================================
--- llvm/utils/gn/build/toolchain/BUILD.gn
+++ llvm/utils/gn/build/toolchain/BUILD.gn
@@ -219,10 +219,14 @@
 }
 
 if (android_ndk_path != "") {
+  # Android compiler-rt libraries don't really work with per-target runtime
+  # directories yet so force it off.
+  # https://discourse.llvm.org/t/handling-version-numbers-in-per-target-runtime-directories/62717.
   stage2_unix_toolchain("stage2_android_aarch64") {
     toolchain_args = {
       current_os = "android"
       current_cpu = "arm64"
+      clang_enable_per_target_runtime_dir = false
     }
   }
 
@@ -230,6 +234,7 @@
     toolchain_args = {
       current_os = "android"
       current_cpu = "arm"
+      clang_enable_per_target_runtime_dir = false
     }
   }
 
@@ -237,6 +242,7 @@
     toolchain_args = {
       current_os = "android"
       current_cpu = "x64"
+      clang_enable_per_target_runtime_dir = false
     }
   }
 
@@ -244,6 +250,7 @@
     toolchain_args = {
       current_os = "android"
       current_cpu = "x86"
+      clang_enable_per_target_runtime_dir = false
     }
   }
 }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D157901.551195.patch
Type: text/x-patch
Size: 1173 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20230817/0596fa4d/attachment.bin>