From 403ab71eba79b116cf06876967e8a215514990cc Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Fri, 17 Oct 2014 16:58:38 -0700 Subject: [PATCH] Fix breakage for x86_64 static executables. Yikes. Don't know how this slipped through code review. I had actually mentioned a need for cleanup in this part of the build system earlier, since the amount of duplication between transform-o-to-* for each arch means we might fix things incorrectly in one of them (as I've just shown). Similarly, code reviewers are likely to skim each one after the first if they all look close enough (which is presumably what happened here). Change-Id: I9b85914510f0b114485021deb97f42740712aae5 --- core/combo/TARGET_linux-x86_64.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/combo/TARGET_linux-x86_64.mk b/core/combo/TARGET_linux-x86_64.mk index a6fa795985..f34059868c 100644 --- a/core/combo/TARGET_linux-x86_64.mk +++ b/core/combo/TARGET_linux-x86_64.mk @@ -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))) \