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

Commit 7f59a7bc authored by Conley Owens's avatar Conley Owens Committed by Android (Google) Code Review
Browse files

Merge "Place linker arguments after objects for gcc"

parents 4906f456 d9e7d257

core/definitions.mk

+7 −7
Original line number Diff line number Diff line
@@ -1292,13 +1292,6 @@ endef 
ifneq ($(HOST_CUSTOM_LD_COMMAND),true)

define transform-host-o-to-executable-inner

$(hide) $(PRIVATE_CXX) \

	-Wl,-rpath-link=$(HOST_OUT_INTERMEDIATE_LIBRARIES) \

	-Wl,-rpath,\$$ORIGIN/../lib \

	$(HOST_GLOBAL_LD_DIRS) \

	$(PRIVATE_LDFLAGS) \

	$(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \

		$(HOST_GLOBAL_LDFLAGS) \

	) \

	$(PRIVATE_ALL_OBJECTS) \

	-Wl,--whole-archive \

	$(call normalize-host-libraries,$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES)) \
@@ -1307,6 +1300,13 @@ $(hide) $(PRIVATE_CXX) \ 
	$(call normalize-host-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \

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

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

	-Wl,-rpath-link=$(HOST_OUT_INTERMEDIATE_LIBRARIES) \

	-Wl,-rpath,\$$ORIGIN/../lib \

	$(HOST_GLOBAL_LD_DIRS) \

	$(PRIVATE_LDFLAGS) \

	$(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \

		$(HOST_GLOBAL_LDFLAGS) \

	) \

	-o $@ \

	$(PRIVATE_LDLIBS)

endef