aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-05-07 09:34:46 -0700
committerandroid code review <noreply-gerritcodereview@google.com>2012-05-07 09:34:47 -0700
commit52fb3bade412ef2de0f2222bced2052245cce952 (patch)
tree7068305e42d77c0b74e0693937c6a1ed0161fb25
parent2485e9e3412fbe9e27bb2d44950106349988dca6 (diff)
parent108cfc15146783b72d3d427b5d9288ef15a4764a (diff)
downloadexternal_qemu-52fb3bade412ef2de0f2222bced2052245cce952.zip
external_qemu-52fb3bade412ef2de0f2222bced2052245cce952.tar.gz
external_qemu-52fb3bade412ef2de0f2222bced2052245cce952.tar.bz2
Merge "Use the same compilation options on OS X 10.8 as 10.7"
-rw-r--r--Makefile.android4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.android b/Makefile.android
index 797bb71..d61264b 100644
--- a/Makefile.android
+++ b/Makefile.android
@@ -209,8 +209,8 @@ endif
ifeq ($(HOST_OS),darwin)
QEMU_SYSTEM_LDLIBS += -Wl,-framework,Cocoa,-framework,QTKit,-framework,CoreVideo
- ifneq ($(filter 10.7 10.7.%,$(DARWIN_VERSION)),)
- # Lion/XCode4 needs to be explicitly told the dynamic library
+ ifneq ($(filter 10.7 10.7.% 10.8 10.8.%,$(DARWIN_VERSION)),)
+ # 10.7+ with XCode4 needs to be explicitly told the dynamic library
# lookup symbols in the precompiled libSDL are resolved at
# runtime
QEMU_SYSTEM_LDLIBS += -undefined dynamic_lookup