From 3fb48b70884aedc6344c17bfa1ac1c01bdc454a3 Mon Sep 17 00:00:00 2001 From: Ryan Prichard Date: Wed, 1 Jul 2020 14:30:25 -0700 Subject: [PATCH] [compiler-rt][Android] Use correct builtins library name for tests The builtins library name is special on Android: * There is an "-android" suffix. * For the compiler-rt i386 architecture, Android targets i686 (in the triple and in the builtins library filename) With this change, check-builtins works with Android. Reviewed By: compnerd Differential Revision: https://reviews.llvm.org/D82149 --- compiler-rt/test/lit.common.configured.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/compiler-rt/test/lit.common.configured.in b/compiler-rt/test/lit.common.configured.in index a0203c0..4a3e268 100644 --- a/compiler-rt/test/lit.common.configured.in +++ b/compiler-rt/test/lit.common.configured.in @@ -48,6 +48,11 @@ config.available_features.add('target-is-%s' % config.target_arch) if config.enable_per_target_runtime_dir: set_default("target_suffix", "") +elif config.android: + if config.target_arch == "i386": + set_default("target_suffix", "-i686-android") + else: + set_default("target_suffix", "-%s-android" % config.target_arch) else: set_default("target_suffix", "-%s" % config.target_arch) -- 2.7.4