diff options
| author | pabelanger <pabelanger@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-05-15 23:41:19 +0000 |
|---|---|---|
| committer | pabelanger <pabelanger@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-05-15 23:41:19 +0000 |
| commit | ad1718a15963c605d20fbbfe256991d2035a5864 (patch) | |
| tree | 8e70eb66e47fd8419fd6f7f2b9f4d0560bb4b047 /codecs | |
| parent | 9b50ebb6386edbd7574aec48f7dd2469f7b1a6f3 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.2@263202 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'codecs')
| -rw-r--r-- | codecs/gsm/Makefile | 22 |
1 files changed, 12 insertions, 10 deletions
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. |