diff options
author | Ian Rogers <irogers@google.com> | 2014-06-05 11:09:44 -0700 |
---|---|---|
committer | Ian Rogers <irogers@google.com> | 2014-06-05 11:09:44 -0700 |
commit | ada2964799159589b4bffe1e1ba72c664cff094a (patch) | |
tree | 8fe808f972c4c2e9b383dba7773a0b458e600494 | |
parent | 8bf60df6e9407ed616ad7edac44c289ea2ac8101 (diff) | |
download | libcxx-ada2964799159589b4bffe1e1ba72c664cff094a.tar.gz |
Build host with multilib both enabled.
Change-Id: I4ae94f247e9df8e20bf837fd7ff3e6405c7f6e85
-rw-r--r-- | Android.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk index eb16d909c..471feeb2c 100644 --- a/Android.mk +++ b/Android.mk @@ -100,6 +100,7 @@ LOCAL_SRC_FILES := $(LIBCXX_SRC_FILES) LOCAL_C_INCLUDES := $(LIBCXX_C_INCLUDES) LOCAL_CPPFLAGS := $(LIBCXX_CPPFLAGS) LOCAL_RTTI_FLAG := -frtti +LOCAL_MULTILIB := both ifeq ($(HOST_OS), darwin) LOCAL_C_INCLUDES += external/libcxxabi/include @@ -119,6 +120,7 @@ LOCAL_CLANG := true LOCAL_LDFLAGS := -nodefaultlibs LOCAL_LDLIBS := -lc LOCAL_WHOLE_STATIC_LIBRARIES := libc++ +LOCAL_MULTILIB := both ifeq ($(HOST_OS), darwin) LOCAL_LDFLAGS += \ |