sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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/
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@297407 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Paul Belanger 2010-12-02 20:11:32 +00:00
parent 05b078a07d
commit 3960c9b41f
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -231,6 +231,9 @@ ifeq ($(PROC),ppc)
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)