From 5e7121b44f9b9c305784b1601b04272f43eab28b Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Mon, 19 Sep 2011 20:31:09 +0000 Subject: Merged revisions 336734 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/10 ................ r336734 | tilghman | 2011-09-19 15:29:40 -0500 (Mon, 19 Sep 2011) | 18 lines Merged revisions 336733 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r336733 | tilghman | 2011-09-19 15:27:03 -0500 (Mon, 19 Sep 2011) | 11 lines Various changes to allow 1.8 to compile on Mac OS X Lion (10.7) * Makefile workaround for 10.6 extended to work on 10.7 and later. * Now uses the 'weak' symbol for Lion systems, which no longer support 'weak_import' Closes ASTERISK-17612. Closes ASTERISK-18213. Tested by: tilghman, oej. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@336735 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- codecs/gsm/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'codecs/gsm') diff --git a/codecs/gsm/Makefile b/codecs/gsm/Makefile index eddfcbb75..a3dd20124 100644 --- a/codecs/gsm/Makefile +++ b/codecs/gsm/Makefile @@ -57,8 +57,8 @@ ifeq ($(findstring -march,$(_ASTCFLAGS) $(ASTCFLAGS)),) endif else ifneq (,$(findstring $(OSARCH),Darwin)) - ifeq ($(shell /usr/bin/sw_vers -productVersion | cut -c1-4),10.6) - # Snow Leopard reports i386, even though it's really x86_64 + ifeq ($(shell if test `/usr/bin/sw_vers -productVersion | cut -c4` -gt 5; then echo 6; else echo 0; fi),6) + # Snow Leopard/Lion reports i386, even though it's really x86_64 OPTIMIZE+=-mtune=native endif endif -- cgit v1.2.3