diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-05-08 11:32:54 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-08 11:32:54 -0700 |
| commit | 92fadc6fbf77d0d3c4ef6922e302b090e51884cb (patch) | |
| tree | e787baac70746a4fc6f6c30a0a09d554d886fb50 /core/combo/HOST_darwin-x86.mk | |
| parent | 23e7e5ab0fbbcdc63dafaa2b3d23043661f98cd2 (diff) | |
| parent | 269a40d140753aee1e579f8179b132ffe3415150 (diff) | |
| download | build-92fadc6fbf77d0d3c4ef6922e302b090e51884cb.zip build-92fadc6fbf77d0d3c4ef6922e302b090e51884cb.tar.gz build-92fadc6fbf77d0d3c4ef6922e302b090e51884cb.tar.bz2 | |
am 269a40d1: am b031afab: am bf3d3287: Merge "Use the same compilation flags on OS X 10.8 as 10.7"
* commit '269a40d140753aee1e579f8179b132ffe3415150':
Use the same compilation flags on OS X 10.8 as 10.7
Diffstat (limited to 'core/combo/HOST_darwin-x86.mk')
| -rw-r--r-- | core/combo/HOST_darwin-x86.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/combo/HOST_darwin-x86.mk b/core/combo/HOST_darwin-x86.mk index 2e80985..63c119e 100644 --- a/core/combo/HOST_darwin-x86.mk +++ b/core/combo/HOST_darwin-x86.mk @@ -74,7 +74,7 @@ HOST_JNILIB_SUFFIX := .jnilib HOST_GLOBAL_CFLAGS += \ -include $(call select-android-config-h,darwin-x86) -ifneq ($(filter 10.7.%, $(build_mac_version)),) +ifneq ($(filter 10.7 10.7.% 10.8 10.8.%, $(build_mac_version)),) HOST_RUN_RANLIB_AFTER_COPYING := false else HOST_RUN_RANLIB_AFTER_COPYING := true |