Partial fix for emulator under Lion.

Don't use -Wl,-dynamic on Lion
This commit is contained in:
Al Sutton 2012-01-04 15:16:50 -08:00 committed by Jean-Baptiste Queru
parent d38c870d2e
commit 80cfc37d0f

View file

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