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

Commit a8d89e15 authored by Torne (Richard Coles)'s avatar Torne (Richard Coles) Committed by Android (Google) Code Review
Browse files

Merge "Don't try to group static libraries on mac." into jb-mr2-dev

parents bacedf66 71f8b245

core/combo/HOST_darwin-x86.mk

+0 −4
Original line number Diff line number Diff line
@@ -123,9 +123,7 @@ $(hide) $(PRIVATE_CXX) \ 
        $(PRIVATE_ALL_OBJECTS) \

        $(addprefix -force_load , $(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES)) \

        $(call normalize-host-libraries,$(PRIVATE_ALL_SHARED_LIBRARIES)) \

        $(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--start-group) \

        $(call normalize-host-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \

        $(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--end-group) \

        $(PRIVATE_LDLIBS) \

        -o $@ \

        -install_name @rpath/$(notdir $@) \
@@ -144,9 +142,7 @@ $(hide) $(PRIVATE_CXX) \ 
        $(call normalize-host-libraries,$(PRIVATE_ALL_SHARED_LIBRARIES)) \

        $(PRIVATE_ALL_OBJECTS) \

        $(call normalize-host-libraries,$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES)) \

        $(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--start-group) \

        $(call normalize-host-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \

        $(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--end-group) \

        $(PRIVATE_LDFLAGS) \

        $(PRIVATE_LDLIBS) \

        $(HOST_LIBGCC)