Skip to content

Commit 2041611

Browse files
committed
[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
1 parent 22b9404 commit 2041611

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,31 +219,38 @@ stage2_unix_toolchain("stage2_unix") {
219219
}
220220

221221
if (android_ndk_path != "") {
222+
# Android compiler-rt libraries don't really work with per-target runtime
223+
# directories yet so force it off.
224+
# https://discourse.llvm.org/t/handling-version-numbers-in-per-target-runtime-directories/62717.
222225
stage2_unix_toolchain("stage2_android_aarch64") {
223226
toolchain_args = {
224227
current_os = "android"
225228
current_cpu = "arm64"
229+
clang_enable_per_target_runtime_dir = false
226230
}
227231
}
228232

229233
stage2_unix_toolchain("stage2_android_arm") {
230234
toolchain_args = {
231235
current_os = "android"
232236
current_cpu = "arm"
237+
clang_enable_per_target_runtime_dir = false
233238
}
234239
}
235240

236241
stage2_unix_toolchain("stage2_android_x64") {
237242
toolchain_args = {
238243
current_os = "android"
239244
current_cpu = "x64"
245+
clang_enable_per_target_runtime_dir = false
240246
}
241247
}
242248

243249
stage2_unix_toolchain("stage2_android_x86") {
244250
toolchain_args = {
245251
current_os = "android"
246252
current_cpu = "x86"
253+
clang_enable_per_target_runtime_dir = false
247254
}
248255
}
249256
}

0 commit comments

Comments
 (0)