commit f79ce1589153cfd6cd00d129fa8168df304f304e
author Al Sutton <al@funkyandroid.com> Thu Jan 05 12:08:29 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Jan 05 12:08:29 2012 -0800
tree 831c78581e2b00b5f8ca2e4bf5edf9b59bdde198
parent d35babb2a62522f785833594a7ec4c1423f830c4
parent 1964c8ed2d6b1981ee991b5ecd95ab711affdf62

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

* commit '1964c8ed2d6b1981ee991b5ecd95ab711affdf62':
  Partial fix for emulator under Lion.

core/combo/HOST_darwin-x86.mk

diff --git a/core/combo/HOST_darwin-x86.mk b/core/combo/HOST_darwin-x86.mk
index 3682766..54a64a3 100644
--- a/core/combo/HOST_darwin-x86.mk
+++ b/core/combo/HOST_darwin-x86.mk
@@ -57,6 +57,7 @@
        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 @@
 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)) \