Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e10bb316 authored by Dan Albert's avatar Dan Albert Committed by Rom Lemarchand
Browse files

Fix using libc++_static in dynamic binaries. 

Change-Id: Ia1f37c4c7ab2eb913c8aa29d80b86e44f7bc766d
(cherry picked from commit 2a4a023a)
parent ea076765

core/cxx_stl_setup.mk

+7 −1
Original line number Diff line number Diff line
@@ -50,11 +50,17 @@ ifneq ($(filter $(my_cxx_stl),libc++ libc++_static),) 
    my_cflags += -D_USING_LIBCXX

    my_c_includes += external/libcxx/include



    # Note that the structure of this means that LOCAL_CXX_STL := libc++ will

    # use the static libc++ for static executables.

    ifeq ($(my_link_type),dynamic)

        ifeq ($(my_cxx_stl),libc++)

            my_shared_libraries += libc++

        else

            my_static_libraries += libc++_static

        endif

    else

        my_static_libraries += libc++_static

    endif



    ifdef LOCAL_IS_HOST_MODULE

        my_cppflags += -nostdinc++