StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'd8765f0f843e78c691c77264619125954d710b1a':
  Partial fix for emulator under Lion.
This commit is contained in:
Al Sutton
2012-01-04 20:41:53 -08:00
committed by Android Git Automerger
parent 6a20329368 d8765f0f84
commit 1964c8ed2d
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/combo/HOST_darwin-x86.mk
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)) \