commit ed8206dba48e182f786ec677d56586ffaf973250
author Stephen Hines <srhines@google.com> Mon Oct 20 18:06:34 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 20 18:06:35 2014 +0000
tree e5ee5dbcda0879265bd679b90ff1d8aea07f35c8
parent 28c2d3b9852550bc9ae150e2725e08885f1ade73
parent 781094fa4347eb10d2d55fb75232e19417bda831

Merge "Remove unnecessary 10.8-specific build rules"

core/combo/TARGET_linux-x86_64.mk

diff --git a/core/combo/TARGET_linux-x86_64.mk b/core/combo/TARGET_linux-x86_64.mk
index a6fa795..f340598 100644
--- a/core/combo/TARGET_linux-x86_64.mk
+++ b/core/combo/TARGET_linux-x86_64.mk
@@ -213,8 +213,9 @@
 	$(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))) \