commit 7fba3347b9f9fa67b5be654b45c4af91ceac3f70
author Dan Willemsen <dwillemsen@google.com> Wed Jun 15 22:38:30 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jun 15 22:38:30 2016 +0000
tree e7179aaeb49568e47f473ce33745a51801210977
parent 1fb96c3ff5d1496699185855e459b6aa725c2f51
parent 327fa9c411360ec4f0d3b05142f3c249be0ab4d5

Merge "Forbid libstdc++ on Linux and Darwin"

core/cxx_stl_setup.mk

diff --git a/core/cxx_stl_setup.mk b/core/cxx_stl_setup.mk
index b4ba7a2..bff4d23 100644
--- a/core/cxx_stl_setup.mk
+++ b/core/cxx_stl_setup.mk
@@ -107,10 +107,8 @@
 else ifeq ($(my_cxx_stl),libstdc++)
     ifndef LOCAL_IS_HOST_MODULE
         $(error $(LOCAL_PATH): $(LOCAL_MODULE): libstdc++ is not supported for device modules)
-    else
-        # Host builds will use the system C++. libc++ on Darwin, GNU libstdc++ everywhere else
-        my_cppflags += $($(my_prefix)SYSTEMCPP_CPPFLAGS)
-        my_ldflags += $($(my_prefix)SYSTEMCPP_LDFLAGS)
+    else ifneq ($($(my_prefix)OS),windows)
+        $(error $(LOCAL_PATH): $(LOCAL_MODULE): libstdc++ is not supported on $($(my_prefix)OS))
     endif
 else ifeq ($(my_cxx_stl),none)
     ifdef LOCAL_IS_HOST_MODULE