summaryrefslogtreecommitdiff
path: root/codecs
diff options
context:
space:
mode:
authorKevin P. Fleming <kpfleming@digium.com>2006-05-30 16:08:38 +0000
committerKevin P. Fleming <kpfleming@digium.com>2006-05-30 16:08:38 +0000
commit96016e9206138ceb0bf6b21b8cd58b666b2f7881 (patch)
tree059376f3c43667cee236e93621a8e304cf8545de /codecs
parent18606233da00c62731f403c10e0db5b8fb5652ab (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: https://origsvn.digium.com/svn/asterisk/trunk@30803 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'codecs')
-rw-r--r--codecs/gsm/Makefile2
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