From f053b65f172384728b5c9d857657e6c55e27a9e2 Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Mon, 15 Mar 2010 16:27:08 +0000 Subject: 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/trunk@252488 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- codecs/gsm/Makefile | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'codecs') diff --git a/codecs/gsm/Makefile b/codecs/gsm/Makefile index aae356de6..1153fee5d 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. -- cgit v1.2.3