File tree Expand file tree Collapse file tree 1 file changed +7
-0
lines changed
llvm/utils/gn/build/toolchain Expand file tree Collapse file tree 1 file changed +7
-0
lines changed Original file line number Diff line number Diff line change @@ -219,31 +219,38 @@ stage2_unix_toolchain("stage2_unix") {
219
219
}
220
220
221
221
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.
222
225
stage2_unix_toolchain (" stage2_android_aarch64" ) {
223
226
toolchain_args = {
224
227
current_os = " android"
225
228
current_cpu = " arm64"
229
+ clang_enable_per_target_runtime_dir = false
226
230
}
227
231
}
228
232
229
233
stage2_unix_toolchain (" stage2_android_arm" ) {
230
234
toolchain_args = {
231
235
current_os = " android"
232
236
current_cpu = " arm"
237
+ clang_enable_per_target_runtime_dir = false
233
238
}
234
239
}
235
240
236
241
stage2_unix_toolchain (" stage2_android_x64" ) {
237
242
toolchain_args = {
238
243
current_os = " android"
239
244
current_cpu = " x64"
245
+ clang_enable_per_target_runtime_dir = false
240
246
}
241
247
}
242
248
243
249
stage2_unix_toolchain (" stage2_android_x86" ) {
244
250
toolchain_args = {
245
251
current_os = " android"
246
252
current_cpu = " x86"
253
+ clang_enable_per_target_runtime_dir = false
247
254
}
248
255
}
249
256
}
You can’t perform that action at this time.
0 commit comments