diff options
| author | Dan Albert <danalbert@google.com> | 2015-03-19 13:05:13 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2015-03-19 13:05:13 -0700 |
| commit | 7955bf0fd6c31fb88b06b81376d5dd971812d6cb (patch) | |
| tree | e05c1e19f3a01b4795ec5b8622cb0f68dace5113 /core/cxx_stl_setup.mk | |
| parent | 8ca542f4394affd420271d8df946e199449508e6 (diff) | |
| download | build-7955bf0fd6c31fb88b06b81376d5dd971812d6cb.tar.gz build-7955bf0fd6c31fb88b06b81376d5dd971812d6cb.tar.bz2 build-7955bf0fd6c31fb88b06b81376d5dd971812d6cb.zip | |
Static binaries with libc++ need libs c, m and dl.
Can't be done on the user's end because these libraries all need to be
linked after libc++_static.
Change-Id: Ib21364e6f43689cf59da31d6f561919731ef8272
Diffstat (limited to 'core/cxx_stl_setup.mk')
| -rw-r--r-- | core/cxx_stl_setup.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/core/cxx_stl_setup.mk b/core/cxx_stl_setup.mk index 265d8cb2f..63e206905 100644 --- 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 |