am 6698ba3d: am 840bc269: Merge "Add -static to static link command, for clang."

* commit '6698ba3d6c9efebac63c224a1fb985f0a53a501a':
  Add -static to static link command, for clang.
This commit is contained in:
Chih-Hung Hsieh 2015-01-24 16:58:15 +00:00 committed by Android Git Automerger
commit afa30df68e
1 changed files with 5 additions and 0 deletions

View File

@ -1464,11 +1464,16 @@ endef
## Commands for linking a static executable. In practice,
## we only use this on arm, so the other platforms don't
## have transform-o-to-static-executable defined.
## Clang driver needs -static to create static executable.
## However, bionic/linker uses -shared to overwrite.
## Linker for x86 targets does not allow coexistance of -static and -shared,
## so we add -static only if -shared is not used.
###########################################################
define transform-o-to-static-executable-inner
$(hide) $(PRIVATE_CXX) \
-nostdlib -Bstatic \
$(if $(filter $(PRIVATE_LDFLAGS),-shared),,-static) \
-Wl,--gc-sections \
-o $@ \
$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \