diff options
| author | Ying Wang <wangying@google.com> | 2013-05-06 11:10:54 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-06 11:10:54 -0700 |
| commit | a1c0206c31e9373e712792a62bc07f609822bca9 (patch) | |
| tree | 33e3673858c4dab773ca77d7c4b1c7b218d1c71a /core/combo/TARGET_linux-arm.mk | |
| parent | 7e6362cc37a0e839ce3649a04cd0dbee7da6b660 (diff) | |
| parent | 0eb35626da3e16d8db7756913433ee37f7ec2f49 (diff) | |
| download | build-a1c0206c31e9373e712792a62bc07f609822bca9.zip build-a1c0206c31e9373e712792a62bc07f609822bca9.tar.gz build-a1c0206c31e9373e712792a62bc07f609822bca9.tar.bz2 | |
am 0eb35626: Add extra libgcc.a only for unbundled build.
* commit '0eb35626da3e16d8db7756913433ee37f7ec2f49':
Add extra libgcc.a only for unbundled build.
Diffstat (limited to 'core/combo/TARGET_linux-arm.mk')
| -rw-r--r-- | core/combo/TARGET_linux-arm.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/combo/TARGET_linux-arm.mk b/core/combo/TARGET_linux-arm.mk index 1d1b6bb..8fc39e9 100644 --- a/core/combo/TARGET_linux-arm.mk +++ b/core/combo/TARGET_linux-arm.mk @@ -244,7 +244,7 @@ $(hide) $(PRIVATE_CXX) \ $(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--start-group) \ $(call normalize-target-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \ $(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--end-group) \ - $(PRIVATE_TARGET_LIBGCC) \ + $(if $(TARGET_BUILD_APPS),$(PRIVATE_TARGET_LIBGCC)) \ $(call normalize-target-libraries,$(PRIVATE_ALL_SHARED_LIBRARIES)) \ -o $@ \ $(PRIVATE_TARGET_GLOBAL_LDFLAGS) \ @@ -269,7 +269,7 @@ $(hide) $(PRIVATE_CXX) -nostdlib -Bdynamic -fPIE -pie \ $(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--start-group) \ $(call normalize-target-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \ $(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--end-group) \ - $(PRIVATE_TARGET_LIBGCC) \ + $(if $(TARGET_BUILD_APPS),$(PRIVATE_TARGET_LIBGCC)) \ $(call normalize-target-libraries,$(PRIVATE_ALL_SHARED_LIBRARIES)) \ -o $@ \ $(PRIVATE_TARGET_GLOBAL_LDFLAGS) \ |