From 2ad87ebf26c05ded8cbe5507dd02187b67fd861c Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Fri, 7 Nov 2014 10:05:03 -0800 Subject: [PATCH] Fix error of PRIVATE_LDLIBS introduced by de36cd72. Change-Id: I85644899c8527e061c331eecc707ca1bb0e3fac4 --- core/combo/TARGET_linux-x86_64.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/combo/TARGET_linux-x86_64.mk b/core/combo/TARGET_linux-x86_64.mk index 27e802f039..997ee513e7 100644 --- a/core/combo/TARGET_linux-x86_64.mk +++ b/core/combo/TARGET_linux-x86_64.mk @@ -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