[asterisk-commits] trunk r23637 - in /trunk: ./ Makefile

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Sun Apr 30 08:39:49 2006
New Revision: 23637

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

........
r23636 | kpfleming | 2006-04-30 08:38:22 -0500 (Sun, 30 Apr 2006) | 4 lines

remove extraneous -m64 flag that is not needed
(these are coming from Debian patches <G>)

........

Modified:
    trunk/   (props changed)
    trunk/Makefile

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

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/Makefile?rev=23637&r1=23636&r2=23637&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Sun Apr 30 08:39:49 2006
@@ -214,7 +214,6 @@
     # You must have GCC 3.4 to use k8, otherwise use athlon
     PROC=k8
     #PROC=athlon
-    OPTIONS+=-m64
   endif
 
   ifeq ($(PROC),sparc64)