diff options
| author | Dan Albert <danalbert@google.com> | 2014-10-18 01:05:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-10-18 01:05:36 +0000 |
| commit | 28c2d3b9852550bc9ae150e2725e08885f1ade73 (patch) | |
| tree | 3bf276fe8e1d29d792535843ec8d07d4d41ed38c | |
| parent | 26707ca8bb29b62252dd9d3d346f731f4fad2806 (diff) | |
| parent | 403ab71eba79b116cf06876967e8a215514990cc (diff) | |
| download | build-l-preview.tar.gz | |
Merge "Fix breakage for x86_64 static executables."android-l-preview_r2l-preview
| -rw-r--r-- | core/combo/TARGET_linux-x86_64.mk | 3 |
1 files changed, 2 insertions, 1 deletions
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))) \ |