[svn-commits] russell: branch 1.4 r252851 - /branches/1.4/codecs/gsm/Makefile

[SVN commits to the Digium repositories]

Author: russell
Date: Tue Mar 16 15:13:45 2010
New Revision: 252851

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=252851
Log:
Apply codec_gsm Mac OS X 10.6 build fix that is in trunk and 1.6.X.

Modified:
    branches/1.4/codecs/gsm/Makefile

Modified: branches/1.4/codecs/gsm/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/codecs/gsm/Makefile?view=diff&rev=252851&r1=252850&r2=252851
==============================================================================
--- branches/1.4/codecs/gsm/Makefile (original)
+++ branches/1.4/codecs/gsm/Makefile Tue Mar 16 15:13:45 2010
@@ -38,11 +38,18 @@
 ######### 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.