diff options
| author | Pavel Labath <labath@google.com> | 2018-06-22 13:13:29 +0000 |
|---|---|---|
| committer | Pavel Labath <labath@google.com> | 2018-06-22 13:13:29 +0000 |
| commit | 733ad45b9fcdd6a5c6a6df5d33d65fb6d78c7b31 (patch) | |
| tree | 9d968e7692553a9f25c1aa9fbc9463e3ac06d1ce /lldb/packages/Python/lldbsuite/test/make/Makefile.rules | |
| parent | a52963b404ca6aefcbdbe0198ae9b978a6faf57e (diff) | |
| download | bcm5719-llvm-733ad45b9fcdd6a5c6a6df5d33d65fb6d78c7b31.tar.gz bcm5719-llvm-733ad45b9fcdd6a5c6a6df5d33d65fb6d78c7b31.zip | |
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
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test/make/Makefile.rules')
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/make/Makefile.rules | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules index 802624c674b..32f41b24d5d 100644 --- a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules +++ b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules @@ -247,7 +247,7 @@ ifeq "$(MAKE_GMODULES)" "YES" CFLAGS += $(MANDATORY_MODULE_BUILD_CFLAGS) endif -CXXFLAGS += -std=c++11 $(CFLAGS) +CXXFLAGS += -std=c++11 $(CFLAGS) $(ARCH_CXXFLAGS) LD = $(CC) LDFLAGS ?= $(CFLAGS) LDFLAGS += $(LD_EXTRAS) $(ARCH_LDFLAGS) |
