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

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

Merge "Blacklist libc++ from windows host builds"

parents e4c753f4 1ca3b70f

core/cxx_stl_setup.mk

+9 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ ifeq ($(strip $(LOCAL_CXX_STL)),default) 
                my_cxx_stl := libc++_static

            endif



            ifdef USE_MINGW

            ifeq ($($(my_prefix)OS),windows)

                # libc++ is not supported on mingw.

                my_cxx_stl := libstdc++

            endif
@@ -36,6 +36,14 @@ else 
        # the two options use different names for the STLs.

        $(error $(LOCAL_PATH): $(LOCAL_MODULE): Must use LOCAL_NDK_STL_VARIANT rather than LOCAL_CXX_STL for NDK binaries)

    endif

    ifdef LOCAL_IS_HOST_MODULE

        ifeq ($($(my_prefix)OS),windows)

            ifneq ($(filter $(my_cxx_stl),libc++ libc++_static),)

                # libc++ is not supported on mingw.

                my_cxx_stl := libstdc++

            endif

        endif

    endif

endif



# Yes, this is actually what the clang driver does.