From: Paul Belanger <paul.belanger@polybeacon.com>
Date: Sat, 15 May 2010 23:41:19 +0000 (+0000)
Subject: Merged revisions 252488 via svnmerge from
X-Git-Tag: 1.6.2.9-rc1~2^2~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb763dc4105b3d8d6fb4474baef1394a21d66661;p=thirdparty%2Fasterisk.git

Merged revisions 252488 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r252488 | tilghman | 2010-03-15 12:27:08 -0400 (Mon, 15 Mar 2010) | 9 lines

  Make the Makefile logic more explicit and move the Snow Leopard logic down to where it's not executed on non-Darwin systems.

  (closes issue #17028)
   Reported by: pabelanger
   Patches:
         issue17028_20100315.patch uploaded by seanbright (license 71)
         20100315__issue17028.diff.txt uploaded by tilghman (license 14)
   Tested by: tilghman, pabelanger
........


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

diff --git a/codecs/gsm/Makefile b/codecs/gsm/Makefile
index aae356de67..1153fee5d6 100644
--- a/codecs/gsm/Makefile
+++ b/codecs/gsm/Makefile
@@ -37,17 +37,19 @@ WAV49	= -DWAV49
 ######### ppro's, etc, as well as the AMD K6 and K7.  The compile will
 ######### probably require gcc. 
 
-ifeq (, $(findstring $(OSARCH) , Darwin SunOS ))
-ifeq (, $(findstring $(PROC) , x86_64 amd64 ultrasparc sparc64 arm armv5b armeb ppc powerpc ppc64 ia64 s390 bfin mipsel mips))
-ifeq (, $(findstring $(shell uname -m) , ppc ppc64 alpha armv4l s390 ))
-ifeq ($(shell /usr/bin/sw_vers -productVersion | cut -c1-4),10.6)
-# Wow... Snow Leopard is BROKEN!
-OPTIMIZE+=-mtune=native
+ifeq (,$(findstring $(OSARCH),Darwin SunOS))
+  ifeq (,$(strip $(findstring $(PROC) ,"x86_64 amd64 ultrasparc sparc64 arm armv5b armeb ppc powerpc ppc64 ia64 s390 bfin mipsel mips ")))
+    ifeq (,$(strip $(findstring $(shell uname -m) ,"ppc ppc64 alpha armv4l s390 ")))
+      OPTIMIZE+=-march=$(PROC)
+    endif
+  endif
 else
-OPTIMIZE+=-march=$(PROC)
-endif
-endif
-endif
+  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.