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

Commit 7fba3347 authored by Dan Willemsen's avatar Dan Willemsen Committed by Gerrit Code Review
Browse files

Merge "Forbid libstdc++ on Linux and Darwin"

parents 1fb96c3f 327fa9c4

core/cxx_stl_setup.mk

+2 −4
Original line number Diff line number Diff line
@@ -107,10 +107,8 @@ else ifeq ($(my_cxx_stl),ndk) 
else ifeq ($(my_cxx_stl),libstdc++)

    ifndef LOCAL_IS_HOST_MODULE

        $(error $(LOCAL_PATH): $(LOCAL_MODULE): libstdc++ is not supported for device modules)

    else

        # Host builds will use the system C++. libc++ on Darwin, GNU libstdc++ everywhere else

        my_cppflags += $($(my_prefix)SYSTEMCPP_CPPFLAGS)

        my_ldflags += $($(my_prefix)SYSTEMCPP_LDFLAGS)

    else ifneq ($($(my_prefix)OS),windows)

        $(error $(LOCAL_PATH): $(LOCAL_MODULE): libstdc++ is not supported on $($(my_prefix)OS))

    endif

else ifeq ($(my_cxx_stl),none)

    ifdef LOCAL_IS_HOST_MODULE