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

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

am 8985a409: am 0ea16fcc: am 60335c03: Merge "Revert "Revert "Fix the... 

am 8985a409: am 0ea16fcc: am 60335c03: Merge "Revert "Revert "Fix the libgcc/libatomic link order."""

* commit '8985a409':
  Revert "Revert "Fix the libgcc/libatomic link order.""
parents a48eb45c 8985a409

core/definitions.mk

+6 −8
Original line number Diff line number Diff line
@@ -1442,14 +1442,13 @@ $(hide) $(PRIVATE_CXX) \ 
	$(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--start-group) \

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

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

	$(if $(TARGET_BUILD_APPS),$(PRIVATE_TARGET_LIBGCC)) \

	$(if $(filter true,$(NATIVE_COVERAGE)),$(PRIVATE_TARGET_LIBGCOV)) \

	$(PRIVATE_TARGET_LIBATOMIC) \

	$(PRIVATE_TARGET_LIBGCC) \

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

	-o $@ \

	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_TARGET_LIBATOMIC) \

	$(if $(filter true,$(NATIVE_COVERAGE)),$(PRIVATE_TARGET_LIBGCOV)) \

	$(PRIVATE_TARGET_LIBGCC) \

	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_SO_O)) \

	$(PRIVATE_LDLIBS)

endef
@@ -1506,14 +1505,13 @@ $(hide) $(PRIVATE_CXX) -pie \ 
	$(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--start-group) \

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

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

	$(if $(TARGET_BUILD_APPS),$(PRIVATE_TARGET_LIBGCC)) \

	$(if $(filter true,$(NATIVE_COVERAGE)),$(PRIVATE_TARGET_LIBGCOV)) \

	$(PRIVATE_TARGET_LIBATOMIC) \

	$(PRIVATE_TARGET_LIBGCC) \

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

	-o $@ \

	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \

	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_TARGET_LIBATOMIC) \

	$(if $(filter true,$(NATIVE_COVERAGE)),$(PRIVATE_TARGET_LIBGCOV)) \

	$(PRIVATE_TARGET_LIBGCC) \

	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_O)) \

	$(PRIVATE_LDLIBS)

endef