diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-30 16:08:38 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-30 16:08:38 +0000 |
commit | 480039c4579db521696680de409ebe530c1bfe2f (patch) | |
tree | 059376f3c43667cee236e93621a8e304cf8545de /codecs/gsm | |
parent | 75168aeb12e5b523f471565fbe22f6a08f19c0da (diff) |
Merged revisions 30802 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r30802 | kpfleming | 2006-05-30 11:07:16 -0500 (Tue, 30 May 2006) | 2 lines
another S/390 build fix
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@30803 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'codecs/gsm')
-rw-r--r-- | codecs/gsm/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/codecs/gsm/Makefile b/codecs/gsm/Makefile index bfa73b3c8..12a74f7f6 100644 --- a/codecs/gsm/Makefile +++ b/codecs/gsm/Makefile @@ -212,7 +212,7 @@ GSM_SOURCES = $(SRC)/add.c \ # XXX Keep a space after each findstring argument # XXX should merge with GSM_OBJECTS ifeq (${OSARCH},Linux) -ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc )) +ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc s390 )) ifeq (,$(findstring ${PROC} , arm ia64 )) GSM_SOURCES+= $(SRC)/k6opt.s endif |