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

Commit 87bde62d authored by Ying Wang's avatar Ying Wang Committed by Gerrit Code Review
Browse files

Merge "Fix error of PRIVATE_LDLIBS introduced by de36cd72."

parents 18e6b280 2ad87ebf

core/combo/TARGET_linux-x86_64.mk

+3 −3
Original line number Diff line number Diff line
@@ -171,7 +171,8 @@ $(hide) $(PRIVATE_CXX) \ 
	$(PRIVATE_TARGET_LIBATOMIC) \

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

	$(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \

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

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

	$(PRIVATE_LDLIBS)

endef



define transform-o-to-executable-inner
@@ -222,6 +223,5 @@ $(hide) $(PRIVATE_CXX) \ 
	$(call normalize-target-libraries,$(filter %libcompiler_rt.a,$(PRIVATE_ALL_STATIC_LIBRARIES))) \

	$(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \

	-Wl,--end-group \

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

	$(PRIVATE_LDLIBS)

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

endef