diff options
| author | Al Sutton <al@funkyandroid.com> | 2011-12-21 16:46:37 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-21 16:46:37 -0800 |
| commit | a4f599148632515733293ffff6a9126683abcd35 (patch) | |
| tree | 653c28f7628456f9d32c90db5c184381aa7b246b /core | |
| parent | 5846050fd4ee7d29917769f2e354c55d09d2087d (diff) | |
| parent | 657aeac8423d9e3cd31c0dffcecaad78a53d7604 (diff) | |
| download | build-a4f599148632515733293ffff6a9126683abcd35.zip build-a4f599148632515733293ffff6a9126683abcd35.tar.gz build-a4f599148632515733293ffff6a9126683abcd35.tar.bz2 | |
am 657aeac8: am 9ce06f11: Don\'t run ranlib on MacOS 10.7
* commit '657aeac8423d9e3cd31c0dffcecaad78a53d7604':
Don't run ranlib on MacOS 10.7
Diffstat (limited to 'core')
| -rw-r--r-- | core/combo/HOST_darwin-x86.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/combo/HOST_darwin-x86.mk b/core/combo/HOST_darwin-x86.mk index 544a29e..3682766 100644 --- a/core/combo/HOST_darwin-x86.mk +++ b/core/combo/HOST_darwin-x86.mk @@ -53,7 +53,11 @@ HOST_JNILIB_SUFFIX := .jnilib HOST_GLOBAL_CFLAGS += \ -include $(call select-android-config-h,darwin-x86) -HOST_RUN_RANLIB_AFTER_COPYING := true +ifneq ($(filter 10.7.%, $(build_mac_version)),) + HOST_RUN_RANLIB_AFTER_COPYING := false +else + HOST_RUN_RANLIB_AFTER_COPYING := true +endif HOST_GLOBAL_ARFLAGS := cqs HOST_CUSTOM_LD_COMMAND := true |