diff options
| author | Ying Wang <wangying@google.com> | 2014-05-07 11:33:19 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-05-07 11:33:19 -0700 |
| commit | de36cd72e8e5a154c1fedf63e1ea83af9d5288aa (patch) | |
| tree | b05eec4cad24ea23f7ca0c2a9c33e19ce315a3ca /core/combo/TARGET_linux-x86.mk | |
| parent | a16583a0880f574937f08bf2c86be72b0f4b9274 (diff) | |
| download | build-de36cd72e8e5a154c1fedf63e1ea83af9d5288aa.zip build-de36cd72e8e5a154c1fedf63e1ea83af9d5288aa.tar.gz build-de36cd72e8e5a154c1fedf63e1ea83af9d5288aa.tar.bz2 | |
Apply LOCAL_LDLIBS to target build rules too.
Use LOCAL_LDLIBS to link against prebuilt libraries (such as NDK
libraries).
Previously LOCAL_LDLIBS only applies to host modules and the behaviour
confuses users.
Change-Id: I515546d7b59ef54e8ef09050eb58ec63534c9291
Diffstat (limited to 'core/combo/TARGET_linux-x86.mk')
| -rw-r--r-- | core/combo/TARGET_linux-x86.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk index 01f8242..4f66765 100644 --- a/core/combo/TARGET_linux-x86.mk +++ b/core/combo/TARGET_linux-x86.mk @@ -194,7 +194,8 @@ $(hide) $(PRIVATE_CXX) \ -o $@ \ $(PRIVATE_LDFLAGS) \ $(PRIVATE_TARGET_LIBGCC) \ - $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_SO_O)) + $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_SO_O)) \ + $(PRIVATE_LDLIBS) endef define $(combo_2nd_arch_prefix)transform-o-to-executable-inner @@ -219,7 +220,8 @@ $(hide) $(PRIVATE_CXX) \ -o $@ \ $(PRIVATE_LDFLAGS) \ $(PRIVATE_TARGET_LIBGCC) \ - $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_O)) + $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_O)) \ + $(PRIVATE_LDLIBS) endef define $(combo_2nd_arch_prefix)transform-o-to-static-executable-inner |