am 85e0dce5: am a8b65126: Merge "Add -shared to clang LDFLAGS."

* commit '85e0dce5f49bfcad97494a674f8a50219914962a':
  Add -shared to clang LDFLAGS.
This commit is contained in:
Stephen Hines 2014-05-30 23:08:50 +00:00 committed by Android Git Automerger
commit 15d49c3b30
4 changed files with 4 additions and 0 deletions

View file

@ -227,6 +227,7 @@ $(hide) $(PRIVATE_CXX) \
-nostdlib -Wl,-soname,$(notdir $@) \ -nostdlib -Wl,-soname,$(notdir $@) \
-Wl,--gc-sections \ -Wl,--gc-sections \
-Wl,-shared,-Bsymbolic \ -Wl,-shared,-Bsymbolic \
-shared \
$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \ $(PRIVATE_TARGET_GLOBAL_LD_DIRS) \
$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_SO_O)) \ $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_SO_O)) \
$(PRIVATE_ALL_OBJECTS) \ $(PRIVATE_ALL_OBJECTS) \

View file

@ -165,6 +165,7 @@ $(hide) $(PRIVATE_CXX) \
-nostdlib -Wl,-soname,$(notdir $@) \ -nostdlib -Wl,-soname,$(notdir $@) \
-Wl,--gc-sections \ -Wl,--gc-sections \
-Wl,-shared,-Bsymbolic \ -Wl,-shared,-Bsymbolic \
-shared \
$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \ $(PRIVATE_TARGET_GLOBAL_LD_DIRS) \
$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_SO_O)) \ $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_SO_O)) \
$(PRIVATE_ALL_OBJECTS) \ $(PRIVATE_ALL_OBJECTS) \

View file

@ -218,6 +218,7 @@ $(hide) $(PRIVATE_CXX) \
-nostdlib -Wl,-soname,$(notdir $@) \ -nostdlib -Wl,-soname,$(notdir $@) \
-Wl,--gc-sections \ -Wl,--gc-sections \
-Wl,-shared,-Bsymbolic \ -Wl,-shared,-Bsymbolic \
-shared \
$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \ $(PRIVATE_TARGET_GLOBAL_LD_DIRS) \
$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_SO_O)) \ $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_SO_O)) \
$(PRIVATE_ALL_OBJECTS) \ $(PRIVATE_ALL_OBJECTS) \

View file

@ -226,6 +226,7 @@ define transform-o-to-shared-lib-inner
$(hide) $(PRIVATE_CXX) \ $(hide) $(PRIVATE_CXX) \
-nostdlib -Wl,-soname,$(notdir $@) \ -nostdlib -Wl,-soname,$(notdir $@) \
-Wl,--gc-sections \ -Wl,--gc-sections \
-shared \
-Wl,-shared,-Bsymbolic \ -Wl,-shared,-Bsymbolic \
$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \ $(PRIVATE_TARGET_GLOBAL_LD_DIRS) \
$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_SO_O)) \ $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_SO_O)) \