summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2014-08-14 13:45:38 -0700
committerDan Albert <danalbert@google.com>2014-08-15 09:22:16 -0700
commit4b8f3fcd3196ba291f82321cd5d1bd688b52d2ba (patch)
tree1bb8e6d96ff2dd094ac3341a90d4d0db7ce30014
parent3253c95c3b515bf56589eaae19214d3a8e64f489 (diff)
downloadexternal_libcxx-4b8f3fcd3196ba291f82321cd5d1bd688b52d2ba.tar.gz
external_libcxx-4b8f3fcd3196ba291f82321cd5d1bd688b52d2ba.tar.bz2
external_libcxx-4b8f3fcd3196ba291f82321cd5d1bd688b52d2ba.zip
Needed so that <stdatomic.h> can identify when a <atomic> header is available. We need to do this because including <atomic> after <stdatomic.h> causes compilation to fail, and the cleanest way out of that situation is to make <stdatomic.h> include <atomic> when it is using in a C++ context. Bug: 17007799 Change-Id: Ic5798cb579840c4a49c3eb2c9e468d5f61fb6dd3 (cherry picked from commit 246124b60c15f201071275dc05f3cf498fa97dd4)
-rw-r--r--libcxx.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/libcxx.mk b/libcxx.mk
index b6ab7b79e..a3258656a 100644
--- a/libcxx.mk
+++ b/libcxx.mk
@@ -20,6 +20,7 @@ LOCAL_C_INCLUDES := \
external/libcxx/include \
$(LOCAL_C_INCLUDES) \
+LOCAL_CFLAGS += -D_USING_LIBCXX
LOCAL_CPPFLAGS += -nostdinc++
LOCAL_LDFLAGS += -nodefaultlibs
LOCAL_LDLIBS += -lm -lc