From: Russell Bryant <russell@russellbryant.com>
Date: Tue, 16 Mar 2010 20:13:45 +0000 (+0000)
Subject: Apply codec_gsm Mac OS X 10.6 build fix that is in trunk and 1.6.X.
X-Git-Tag: 1.4.31-rc1~2^2~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df1a03e005d83ce218dbd57609f7edd493c21772;p=thirdparty%2Fasterisk.git

Apply codec_gsm Mac OS X 10.6 build fix that is in trunk and 1.6.X.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@252851 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/codecs/gsm/Makefile b/codecs/gsm/Makefile
index 07a0b807c5..20fcb5021f 100644
--- a/codecs/gsm/Makefile
+++ b/codecs/gsm/Makefile
@@ -38,11 +38,18 @@ WAV49	= -DWAV49
 ######### probably require gcc. 
 
 ifeq (, $(findstring $(OSARCH) , Darwin SunOS ))
-ifeq (, $(findstring $(PROC) , x86_64 amd64 ultrasparc sparc64 arm armv5b armeb hppa2.0 ppc powerpc ppc64 ia64 s390 bfin mipsel mips))
-ifeq (, $(findstring $(shell uname -m) , ppc ppc64 alpha armv4l s390 ))
-OPTIMIZE+=-march=$(PROC)
-endif
-endif
+  ifeq (, $(findstring $(PROC) , x86_64 amd64 ultrasparc sparc64 arm armv5b armeb hppa2.0 ppc powerpc ppc64 ia64 s390 bfin mipsel mips))
+    ifeq (, $(findstring $(shell uname -m) , ppc ppc64 alpha armv4l s390 ))
+      OPTIMIZE+=-march=$(PROC)
+    endif
+  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
+      OPTIMIZE+=-mtune=native
+    endif
+  endif
 endif
 
 #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.