This is an archive of the discontinued LLVM Phabricator instance.

Differential D30737

Android.rules: Add libc++ support
ClosedPublic

Authored by labath on Mar 8 2017, 7:44 AM.

Details

Reviewers
danalbert
eugene
EricWF
Commits
rG7163ecb4294e: Android.rules: Add libc++ support
rLLDB297616: Android.rules: Add libc++ support
rL297616: Android.rules: Add libc++ support
Summary

This adds support for building libc++ tests when targetting android. The
tests are still not passing due to several other problems, but this way
we can at least build them.

Diff Detail

Event Timeline

labath created this revision.Mar 8 2017, 7:44 AM
Harbormaster completed remote builds in B4623: Diff 91018.Mar 8 2017, 7:44 AM
Herald added a reviewer: EricWF. · View Herald TranscriptMar 8 2017, 7:44 AM
Herald added a subscriber: srhines. · View Herald Transcript
Closed by commit rL297616: Android.rules: Add libc++ support (authored by labath). · Explain WhyMar 13 2017, 5:20 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
packages/
Python/
lldbsuite/
test/
make/
28 lines
8 lines

Diff 91018

packages/Python/lldbsuite/test/make/Android.rules

Show First 20 Lines • Show All 55 Lines • ▼ Show 20 Lines
ifeq "$(findstring clang,$(CC))" "clang" ifeq "$(findstring clang,$(CC))" "clang"
ARCH_CFLAGS += -target $(TRIPLE) \ ARCH_CFLAGS += -target $(TRIPLE) \
-gcc-toolchain $(NDK_ROOT)/toolchains/$(TOOLCHAIN_DIR)/prebuilt/$(HOST_TAG) -gcc-toolchain $(NDK_ROOT)/toolchains/$(TOOLCHAIN_DIR)/prebuilt/$(HOST_TAG)
ARCH_LDFLAGS += -target $(TRIPLE) \ ARCH_LDFLAGS += -target $(TRIPLE) \
-gcc-toolchain $(NDK_ROOT)/toolchains/$(TOOLCHAIN_DIR)/prebuilt/$(HOST_TAG) -gcc-toolchain $(NDK_ROOT)/toolchains/$(TOOLCHAIN_DIR)/prebuilt/$(HOST_TAG)
endif endif
ARCH_CFLAGS += --sysroot=$(NDK_ROOT)/platforms/android-$(API_LEVEL)/arch-$(SYSROOT_ARCH)
ARCH_LDFLAGS += --sysroot=$(NDK_ROOT)/platforms/android-$(API_LEVEL)/arch-$(SYSROOT_ARCH) -lm
ifeq (1,$(USE_LIBCPP))
ARCH_CFLAGS += \
-isystem $(NDK_ROOT)/sources/cxx-stl/llvm-libc++/include \
-isystem $(NDK_ROOT)/sources/android/support/include \
-isystem $(NDK_ROOT)/sources/cxx-stl/llvm-libc++abi/include
ARCH_LDFLAGS += \
-L$(NDK_ROOT)/sources/cxx-stl/llvm-libc++/libs/$(STL_ARCH) \
-l$(NDK_ROOT)/sources/cxx-stl/llvm-libc++/libs/$(STL_ARCH)/libc++.a
else
ARCH_CFLAGS += \ ARCH_CFLAGS += \
--sysroot=$(NDK_ROOT)/platforms/android-$(API_LEVEL)/arch-$(SYSROOT_ARCH) \
-isystem $(NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.9/include \ -isystem $(NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.9/include \
-isystem $(NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.9/libs/$(STL_ARCH)/include \ -isystem $(NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.9/libs/$(STL_ARCH)/include \
-isystem $(NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.9/include/backward -isystem $(NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.9/include/backward
ARCH_LDFLAGS += -lm \
$(NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.9/libs/$(STL_ARCH)/libgnustl_static.a \ ARCH_LDFLAGS += $(NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.9/libs/$(STL_ARCH)/libgnustl_static.a
--sysroot=$(NDK_ROOT)/platforms/android-$(API_LEVEL)/arch-$(SYSROOT_ARCH) endif

packages/Python/lldbsuite/test/make/Makefile.rules

Show First 20 Lines • Show All 318 Lines • ▼ Show 20 Lines ifneq (,$(findstring clang,$(CC)))
CXXFLAGS += -stdlib=libstdc++ -DLLDB_USING_LIBSTDCPP CXXFLAGS += -stdlib=libstdc++ -DLLDB_USING_LIBSTDCPP
LDFLAGS += -stdlib=libstdc++ LDFLAGS += -stdlib=libstdc++
endif endif
endif endif
ifeq (1,$(USE_LIBCPP)) ifeq (1,$(USE_LIBCPP))
# Clang requires an extra flag: -stdlib=libstdc++ # Clang requires an extra flag: -stdlib=libstdc++
ifneq (,$(findstring clang,$(CC))) ifneq (,$(findstring clang,$(CC)))
CXXFLAGS += -DLLDB_USING_LIBCPP
ifeq "$(OS)" "Linux" ifeq "$(OS)" "Linux"
# This is the default install location on Ubuntu 14.04 # This is the default install location on Ubuntu 14.04
ifneq ($(wildcard /usr/include/c++/v1/.),) ifneq ($(wildcard /usr/include/c++/v1/.),)
CXXFLAGS += -stdlib=libc++ -DLLDB_USING_LIBCPP CXXFLAGS += -stdlib=libc++
LDFLAGS += -stdlib=libc++ LDFLAGS += -stdlib=libc++
CXXFLAGS += -I/usr/include/c++/v1 CXXFLAGS += -I/usr/include/c++/v1
endif endif
else ifeq "$(OS)" "Android"
# Nothing to do, this is already handled in
# Android.rules.
else else
CXXFLAGS += -stdlib=libc++ -DLLDB_USING_LIBCPP CXXFLAGS += -stdlib=libc++
LDFLAGS += -stdlib=libc++ LDFLAGS += -stdlib=libc++
endif endif
endif endif
endif endif
#---------------------------------------------------------------------- #----------------------------------------------------------------------
# dylib settings # dylib settings
#---------------------------------------------------------------------- #----------------------------------------------------------------------
▲ Show 20 Lines • Show All 305 Lines • Show Last 20 Lines