From 733ad45b9fcdd6a5c6a6df5d33d65fb6d78c7b31 Mon Sep 17 00:00:00 2001 From: Pavel Labath Date: Fri, 22 Jun 2018 13:13:29 +0000 Subject: Android.rules: Use libc++ by default libstdc++ will soon be dropped from the android NDK. This patch makes sure we are prepared for that by using libc++ in tests by default (i.e., except for libstdc++ data formatter tests). Only a couple of small tweaks were needed to make this work: - Add the libc++ include paths to CXXFLAGS only. This was necessary to make the tests compile with -fmodules. The modules tests have been disabled, but this way, they will be ready for them if they are enabled. - in one test I had to add an explicit std::string copy to make sure the copy constructor is there for the expression evaluator to find it. llvm-svn: 335344 --- lldb/packages/Python/lldbsuite/test/lang/cpp/auto/main.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'lldb/packages/Python/lldbsuite/test/lang/cpp/auto/main.cpp') diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/auto/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/auto/main.cpp index 76fb95e0a34..6aee25c2160 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/auto/main.cpp +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/auto/main.cpp @@ -12,5 +12,10 @@ int main() { std::string helloworld("hello world"); + + // Ensure std::string copy constructor is present in the binary, as we will + // use it in an expression. + std::string other = helloworld; + return 0; // break here } -- cgit v1.2.3