From 327fa9c411360ec4f0d3b05142f3c249be0ab4d5 Mon Sep 17 00:00:00 2001
From: Dan Willemsen <dwillemsen@google.com>
Date: Wed, 15 Jun 2016 13:41:45 -0700
Subject: [PATCH] Forbid libstdc++ on Linux and Darwin

The last user has been removed, forbid any modules from selecting this.

Change-Id: Idd9ef6ca4b6c6754935d59c4a09c7d213ae481c1
---
 core/cxx_stl_setup.mk | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/core/cxx_stl_setup.mk b/core/cxx_stl_setup.mk
index b4ba7a2691..bff4d23d13 100644
--- a/core/cxx_stl_setup.mk
+++ b/core/cxx_stl_setup.mk
@@ -107,10 +107,8 @@ else ifeq ($(my_cxx_stl),ndk)
 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