aboutsummaryrefslogtreecommitdiffstats
path: root/codecs
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2006-03-12 18:07:23 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2006-03-12 18:07:23 +0000
commit71bef7bacc955d7dae67ef5258c55055199c181a (patch)
tree72da713c799d8604126ace80b4d60401060f718a /codecs
parent566af08e493b66ca7448ebb0561dcad1f062df59 (diff)
Merged revisions 12577 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r12577 | russell | 2006-03-12 12:57:37 -0500 (Sun, 12 Mar 2006) | 2 lines fix build on parisc (issue #6704) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@12610 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'codecs')
-rw-r--r--codecs/gsm/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/codecs/gsm/Makefile b/codecs/gsm/Makefile
index 8c0cf9929..f162b141b 100644
--- a/codecs/gsm/Makefile
+++ b/codecs/gsm/Makefile
@@ -239,6 +239,7 @@ ifneq ($(shell uname -m),armv4l)
ifneq ($(shell uname -m),sparc64)
ifneq (${PROC},arm)
ifneq (${PROC},ia64)
+ifneq ($(shell uname -m), parisc)
GSM_SOURCES+= $(SRC)/k6opt.s
endif
endif
@@ -302,6 +303,7 @@ ifneq ($(shell uname -m), alpha)
ifneq ($(shell uname -m), sparc64)
ifneq ($(shell uname -m), armv4l)
ifneq (${PROC},ia64)
+ifneq ($(shell uname -m), parisc)
GSM_OBJECTS+= $(SRC)/k6opt.o
endif
endif