From 96283922244d8e47b9927b63819d38333093bb68 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Fri, 2 Nov 2018 22:57:04 +0000 Subject: [PATCH] Workaround using new Clang with an old NDK. We're using an old NDK and a new Clang. New Clangs default to `-stdlib=libc++` for Android, but those libraries cannot be found by default with an old NDK. Use an explicit `-stdlib=libstdc++` in the cxx_mode_flags. llvm-svn: 346051 --- compiler-rt/test/lit.common.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/compiler-rt/test/lit.common.cfg b/compiler-rt/test/lit.common.cfg index 659122712a4f..cdcba5fc9d5d 100644 --- a/compiler-rt/test/lit.common.cfg +++ b/compiler-rt/test/lit.common.cfg @@ -59,6 +59,7 @@ if config.asan_shadow_scale != '': # transitive shared library dependency (via asan runtime). if config.android: config.target_cflags += " -pie -fuse-ld=gold -Wl,--enable-new-dtags" + config.cxx_mode_flags.append('-stdlib=libstdc++') # Clear some environment variables that might affect Clang. possibly_dangerous_env_vars = ['ASAN_OPTIONS', 'DFSAN_OPTIONS', 'LSAN_OPTIONS',