[svn-commits] trunk r30297 - in /trunk: ./ codecs/gsm/Makefile

[svn-commits at lists.digium.com]

Author: kpfleming
Date: Thu May 25 12:39:46 2006
New Revision: 30297

URL: http://svn.digium.com/view/asterisk?rev=30297&view=rev
Log:
Merged revisions 30296 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r30296 | kpfleming | 2006-05-25 12:39:33 -0500 (Thu, 25 May 2006) | 2 lines

don't try to use -march=s390 when building on S/390 systems (reported via asterisk-users mailing list)

........

Modified:
    trunk/   (props changed)
    trunk/codecs/gsm/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: trunk/codecs/gsm/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/codecs/gsm/Makefile?rev=30297&r1=30296&r2=30297&view=diff
==============================================================================
--- trunk/codecs/gsm/Makefile (original)
+++ trunk/codecs/gsm/Makefile Thu May 25 12:39:46 2006
@@ -40,6 +40,7 @@
 ifeq (, $(findstring $(OSARCH) , Darwin SunOS ))
 ifeq (, $(findstring $(PROC) , x86_64 amd64 ultrasparc sparc64 arm ppc ppc64 ia64 ))
 ifeq (, $(findstring $(shell uname -m) , ppc ppc64 alpha armv4l ))
+ifneq (${PROC},s390)
 OPTIMIZE+=-march=$(PROC)
 endif
 endif