aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-03-16 20:13:45 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-03-16 20:13:45 +0000
commite0d22e6d9c8501163a86d01ea87cffe1c07d0464 (patch)
treead8d0a369002e62c64c8ead372ef0ee0fb6921d3
parenteb1d3681bbf4459ae5d5cc7986166dc03f25836d (diff)
Apply codec_gsm Mac OS X 10.6 build fix that is in trunk and 1.6.X.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@252851 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--codecs/gsm/Makefile17
1 files changed, 12 insertions, 5 deletions
diff --git a/codecs/gsm/Makefile b/codecs/gsm/Makefile
index 07a0b807c..20fcb5021 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.