From ea07676552f18ccb01bbbfe6e34dc6c0ac88d3be Mon Sep 17 00:00:00 2001
From: Dan Albert <danalbert@google.com>
Date: Wed, 6 May 2015 10:08:11 -0700
Subject: [PATCH] Cleanup libc++ configuration.

Change-Id: Id1eeeb23466b04a4fe64c04e1768b98a1068b5a8
(cherry picked from commit 0ad5bd22c898cbf0e8d1e156dace080f4e11a0a1)
---
 core/cxx_stl_setup.mk | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/core/cxx_stl_setup.mk b/core/cxx_stl_setup.mk
index 3450b2cba..f9f2debd9 100644
--- a/core/cxx_stl_setup.mk
+++ b/core/cxx_stl_setup.mk
@@ -49,15 +49,11 @@ endif
 ifneq ($(filter $(my_cxx_stl),libc++ libc++_static),)
     my_cflags += -D_USING_LIBCXX
     my_c_includes += external/libcxx/include
-    ifeq ($(my_cxx_stl),libc++)
+
+    ifeq ($(my_link_type),dynamic)
         my_shared_libraries += libc++
     else
         my_static_libraries += libc++_static
-        ifndef LOCAL_IS_HOST_MODULE
-            ifeq ($(LOCAL_FORCE_STATIC_EXECUTABLE),true)
-                my_static_libraries += libm libc libdl
-            endif
-        endif
     endif
 
     ifdef LOCAL_IS_HOST_MODULE
@@ -72,7 +68,7 @@ ifneq ($(filter $(my_cxx_stl),libc++ libc++_static),)
         endif
 
         ifeq ($(my_link_type),static)
-            my_static_libraries += libdl
+            my_static_libraries += libm libc libdl
         else
             my_shared_libraries += libdl
         endif
-- 
2.11.0