| commit | 59112a2da30004b20c186e0878148cd6053ae859 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Fri Mar 20 03:04:19 2015 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Mar 20 03:04:20 2015 +0000 |
| tree | 51396549942a7fe43059c19fe9cadabc00f30f50 | |
| parent | b7e5ab6fbd4e573515c30772ac813a5fc4bce680 [diff] | |
| parent | 7955bf0fd6c31fb88b06b81376d5dd971812d6cb [diff] |
Merge "Static binaries with libc++ need libs c, m and dl."
diff --git a/core/cxx_stl_setup.mk b/core/cxx_stl_setup.mk index 265d8cb..63e2069 100644 --- a/core/cxx_stl_setup.mk +++ b/core/cxx_stl_setup.mk
@@ -53,6 +53,11 @@ 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