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

Commit ec28a489 authored by Dan Albert's avatar Dan Albert Committed by Android Git Automerger
Browse files

am 28c2d3b9: Merge "Fix breakage for x86_64 static executables." 

* commit '28c2d3b9':
  Fix breakage for x86_64 static executables.
parents fb77fe99 28c2d3b9

core/combo/TARGET_linux-x86_64.mk

+2 −1
Original line number Diff line number Diff line
@@ -213,8 +213,9 @@ $(hide) $(PRIVATE_CXX) \ 
	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_ALL_OBJECTS) \

	-Wl,--whole-archive \

	$(call normalize-target-libraries,$(filter-out %libcompiler_rt.a,$(filter-out %libc_nomalloc.a,$(filter-out %libc.a,$(PRIVATE_ALL_STATIC_LIBRARIES))))) \

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

	-Wl,--no-whole-archive \

	$(call normalize-target-libraries,$(filter-out %libcompiler_rt.a,$(filter-out %libc_nomalloc.a,$(filter-out %libc.a,$(PRIVATE_ALL_STATIC_LIBRARIES))))) \

	-Wl,--start-group \

	$(call normalize-target-libraries,$(filter %libc.a,$(PRIVATE_ALL_STATIC_LIBRARIES))) \

	$(call normalize-target-libraries,$(filter %libc_nomalloc.a,$(PRIVATE_ALL_STATIC_LIBRARIES))) \