diff options
| author | Al Sutton <al@funkyandroid.com> | 2012-01-04 20:40:35 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-01-04 20:40:35 -0800 |
| commit | d8765f0f843e78c691c77264619125954d710b1a (patch) | |
| tree | 9b8fa1225d4924738c1c311d29dd57177f86bd03 | |
| parent | f3c068db26fd1c862f06423714aadf75bf45136b (diff) | |
| parent | 80cfc37d0f0ddbb7db09b7662b84e816ab409537 (diff) | |
| download | build-d8765f0f843e78c691c77264619125954d710b1a.zip build-d8765f0f843e78c691c77264619125954d710b1a.tar.gz build-d8765f0f843e78c691c77264619125954d710b1a.tar.bz2 | |
am 80cfc37d: Partial fix for emulator under Lion.
* commit '80cfc37d0f0ddbb7db09b7662b84e816ab409537':
Partial fix for emulator under Lion.
| -rw-r--r-- | core/combo/HOST_darwin-x86.mk | 3 |
1 files changed, 2 insertions, 1 deletions
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 @@ 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)) \ |