diff options
| author | pabelanger <pabelanger@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-12-02 20:09:29 +0000 |
|---|---|---|
| committer | pabelanger <pabelanger@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-12-02 20:09:29 +0000 |
| commit | b4edc6badbec25f98b1c3bf282c767a57bda721c (patch) | |
| tree | fa8193a8c12318cfba9b7e215885817d1397e6d9 /Makefile | |
| parent | f912d4da3aa2284fd0ee057e933a07886494c1a7 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.8@297406 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -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) |