diff options
| author | Dan Albert <danalbert@google.com> | 2014-10-14 17:15:17 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-10-14 17:15:17 -0700 |
| commit | ae66eba6f3e6996e57c8aa185d9a57e4684d43e2 (patch) | |
| tree | dd05a965bd75bea8ef89465af445c2e847346613 /core/combo/TARGET_linux-mips.mk | |
| parent | 337dd2e637a9b1c8271d95ac95503e359c472a51 (diff) | |
| parent | 852fc3e69c6daa5ab4e4e12636020bee2b1af7e6 (diff) | |
| download | build-ae66eba6f3e6996e57c8aa185d9a57e4684d43e2.zip build-ae66eba6f3e6996e57c8aa185d9a57e4684d43e2.tar.gz build-ae66eba6f3e6996e57c8aa185d9a57e4684d43e2.tar.bz2 | |
resolved conflicts for merge of 852fc3e6 to lmp-dev-plus-aosp
Change-Id: If3de742dcd2157c4690ae0eb34494dc11492054f
Diffstat (limited to 'core/combo/TARGET_linux-mips.mk')
| -rw-r--r-- | core/combo/TARGET_linux-mips.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/combo/TARGET_linux-mips.mk b/core/combo/TARGET_linux-mips.mk index 9abee7a..5963727 100644 --- a/core/combo/TARGET_linux-mips.mk +++ b/core/combo/TARGET_linux-mips.mk @@ -229,12 +229,13 @@ $(hide) $(PRIVATE_CXX) -nostdlib -Bstatic \ -Wl,--whole-archive \ $(call normalize-target-libraries,$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES)) \ -Wl,--no-whole-archive \ - $(call normalize-target-libraries,$(filter-out %libc_nomalloc.a,$(filter-out %libc.a,$(PRIVATE_ALL_STATIC_LIBRARIES)))) \ + $(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))) \ $(PRIVATE_TARGET_LIBATOMIC) \ $(if $(filter true,$(NATIVE_COVERAGE)),$(PRIVATE_TARGET_LIBGCOV)) \ + $(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)) |