diff options
| author | pabelanger <pabelanger@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-12-02 20:06:43 +0000 |
|---|---|---|
| committer | pabelanger <pabelanger@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-12-02 20:06:43 +0000 |
| commit | 7fe52047422f953220923de2b72e105ab28528cb (patch) | |
| tree | 8174a4ac36c1fd5172f8404ba8f10ad0e5271a88 | |
| parent | 8936c3b20d56d2c3fa392ff82f9729114906cf92 (diff) | |
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.6.2@297405 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -260,6 +260,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) |