am ad3f2ee0: am f1999c8a: am 59112a2d: Merge "Static binaries with libc++ need libs c, m and dl."

* commit 'ad3f2ee0dfbd8d63ffa81d4bb126c7d2cfaded2b': Static binaries with libc++ need libs c, m and dl.
2015-03-20 03:29:23 +00:00
parent 7e44d7febf ad3f2ee0df
commit e6a3ff8d52
1 changed files with 5 additions and 0 deletions
--- a/core/cxx_stl_setup.mk
+++ b/core/cxx_stl_setup.mk
@@ -53,6 +53,11 @@ ifneq ($(filter $(my_cxx_stl),libc++ libc++_static),)
        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