[svn-commits] pabelanger: trunk r297407 - in /trunk: ./ Makefile

[SVN commits to the Digium repositories]

Author: pabelanger
Date: Thu Dec  2 14:11:32 2010
New Revision: 297407

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=297407
Log:
Merged revisions 297406 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r297406 | pabelanger | 2010-12-02 15:09:29 -0500 (Thu, 02 Dec 2010) | 21 lines
  
  Merged revisions 297405 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r297405 | pabelanger | 2010-12-02 15:06:43 -0500 (Thu, 02 Dec 2010) | 14 lines
    
    Merged revisions 297404 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r297404 | pabelanger | 2010-12-02 15:01:08 -0500 (Thu, 02 Dec 2010) | 7 lines
      
      Resolve compile error under FreeBSD
      
      We now set _ASTCFLAGS+=-march=i686 for i386 processors, still allowing ASTCFLAGS
      to override the setting.
      
      Review: https://reviewboard.asterisk.org/r/1043/
    ........
  ................
................

Modified:
    trunk/   (props changed)
    trunk/Makefile

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

Modified: trunk/Makefile
URL: http://svnview.digium.com/svn/asterisk/trunk/Makefile?view=diff&rev=297407&r1=297406&r2=297407
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Thu Dec  2 14:11:32 2010
@@ -231,6 +231,9 @@
 endif
 
 ifeq ($(OSARCH),FreeBSD)
+  ifeq ($(PROC),i386)
+    _ASTCFLAGS+=-march=i686
+  endif
   # -V is understood by BSD Make, not by GNU make.
   BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
   _ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)