diff options
| author | Dan Albert <danalbert@google.com> | 2014-08-08 00:23:56 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-08 00:23:56 +0000 |
| commit | 9d6aa51a0f4bce097b595a6df7cbb09a36c5bf67 (patch) | |
| tree | 327636ee45168b8fee44303fd2faa9b3cfb79fe4 /core/combo/TARGET_linux-arm.mk | |
| parent | d423e5fbdb15b2077a2f93281f43506ba06873c9 (diff) | |
| parent | e99d8947c09731d71db7e95a280cf81f51f4049a (diff) | |
| download | build-9d6aa51a0f4bce097b595a6df7cbb09a36c5bf67.zip build-9d6aa51a0f4bce097b595a6df7cbb09a36c5bf67.tar.gz build-9d6aa51a0f4bce097b595a6df7cbb09a36c5bf67.tar.bz2 | |
am e99d8947: am cbc742a1: Merge "Inhibit implicit -Bsymolic in -shared."
* commit 'e99d8947c09731d71db7e95a280cf81f51f4049a':
Inhibit implicit -Bsymolic in -shared.
Diffstat (limited to 'core/combo/TARGET_linux-arm.mk')
| -rw-r--r-- | core/combo/TARGET_linux-arm.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/combo/TARGET_linux-arm.mk b/core/combo/TARGET_linux-arm.mk index 88f11fd..df81cd5 100644 --- a/core/combo/TARGET_linux-arm.mk +++ b/core/combo/TARGET_linux-arm.mk @@ -196,7 +196,7 @@ define $(combo_2nd_arch_prefix)transform-o-to-shared-lib-inner $(hide) $(PRIVATE_CXX) \ -nostdlib -Wl,-soname,$(notdir $@) \ -Wl,--gc-sections \ - -shared \ + $(if $(filter true,$(PRIVATE_CLANG)),-shared,-Wl,-shared) \ $(PRIVATE_TARGET_GLOBAL_LD_DIRS) \ $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_SO_O)) \ $(PRIVATE_ALL_OBJECTS) \ |