am 1964c8ed: am d8765f0f: am 80cfc37d: Partial fix for emulator under Lion.

* commit '1964c8ed2d6b1981ee991b5ecd95ab711affdf62':
  Partial fix for emulator under Lion.
This commit is contained in:
Al Sutton 2012-01-05 12:08:29 -08:00 committed by Android Git Automerger
commit f79ce15891
1 changed files with 2 additions and 1 deletions

View File

@ -57,6 +57,7 @@ ifneq ($(filter 10.7.%, $(build_mac_version)),)
HOST_RUN_RANLIB_AFTER_COPYING := false
else
HOST_RUN_RANLIB_AFTER_COPYING := true
PRE_LION_DYNAMIC_LINKER_OPTIONS := -Wl,-dynamic
endif
HOST_GLOBAL_ARFLAGS := cqs
@ -82,7 +83,7 @@ endef
define transform-host-o-to-executable-inner
$(hide) $(PRIVATE_CXX) \
-o $@ \
-Wl,-dynamic -headerpad_max_install_names \
$(PRE_LION_DYNAMIC_LINKER_OPTIONS) -headerpad_max_install_names \
$(HOST_GLOBAL_LD_DIRS) \
$(HOST_GLOBAL_LDFLAGS) \
$(call normalize-host-libraries,$(PRIVATE_ALL_SHARED_LIBRARIES)) \