[llvm] 2041611 - [gn build] Force clang_enable_per_target_runtime_dir for Android builds

[Arthur Eubanks via llvm-commits]

Author: Arthur Eubanks
Date: 2023-08-17T11:09:03-07:00
New Revision: 2041611931567b6372dac98318949639d21d9458

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

LOG: [gn build] Force clang_enable_per_target_runtime_dir for Android builds

Since it doesn't work yet.

Reviewed By: thakis

Differential Revision: https://reviews.llvm.org/D157901

Added: 
    

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

Removed: 
    


################################################################################
diff  --git a/llvm/utils/gn/build/toolchain/BUILD.gn b/llvm/utils/gn/build/toolchain/BUILD.gn
index 02a741dafe4afb..8f4a5d2e3e41a8 100644
--- a/llvm/utils/gn/build/toolchain/BUILD.gn
+++ b/llvm/utils/gn/build/toolchain/BUILD.gn
@@ -219,10 +219,14 @@ stage2_unix_toolchain("stage2_unix") {
 }
 
 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 @@ if (android_ndk_path != "") {
     toolchain_args = {
       current_os = "android"
       current_cpu = "arm"
+      clang_enable_per_target_runtime_dir = false
     }
   }
 
@@ -237,6 +242,7 @@ if (android_ndk_path != "") {
     toolchain_args = {
       current_os = "android"
       current_cpu = "x64"
+      clang_enable_per_target_runtime_dir = false
     }
   }
 
@@ -244,6 +250,7 @@ if (android_ndk_path != "") {
     toolchain_args = {
       current_os = "android"
       current_cpu = "x86"
+      clang_enable_per_target_runtime_dir = false
     }
   }
 }