From 80cfc37d0f0ddbb7db09b7662b84e816ab409537 Mon Sep 17 00:00:00 2001
From: Al Sutton <al@funkyandroid.com>
Date: Wed, 4 Jan 2012 15:16:50 -0800
Subject: [PATCH] Partial fix for emulator under Lion.

Don't use -Wl,-dynamic on Lion
---
 core/combo/HOST_darwin-x86.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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