[svn-commits] twilson: branch twilson/config_work r366649 - /team/twilson/config_work/
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Wed May 16 10:45:42 CDT 2012
Author: twilson
Date: Wed May 16 10:45:32 2012
New Revision: 366649
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=366649
Log:
Check for -Wtrampolines the right way
Modified:
team/twilson/config_work/Makefile
team/twilson/config_work/configure
team/twilson/config_work/configure.ac
Modified: team/twilson/config_work/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/twilson/config_work/Makefile?view=diff&rev=366649&r1=366648&r2=366649
==============================================================================
--- team/twilson/config_work/Makefile (original)
+++ team/twilson/config_work/Makefile Wed May 16 10:45:32 2012
@@ -189,7 +189,6 @@
GCCVERSION := $(shell gcc -dumpversion)
GCCMAJORVERSION := $(word 1, $(subst ., ,$(GCCVERSION)))
GCCMINORVERSION := $(word 2, $(subst ., ,$(GCCVERSION)))
-gcccheck=$(shell test $(GCCMAJORVERSION) -ge $(1) -a $(GCCMINORVERSION) -ge $(2); echo $$?)
ifeq ($(AST_DEVMODE),yes)
_ASTCFLAGS+=-Werror
_ASTCFLAGS+=-Wunused
@@ -198,9 +197,6 @@
_ASTCFLAGS+=-Wundef
_ASTCFLAGS+=-Wmissing-format-attribute
_ASTCFLAGS+=-Wformat=2
- ifeq ($(call gcccheck,4,6),0)
- _ASTCFLAGS+=-Wtrampolines
- endif
ifeq ($(AST_DEVMODE_STRICT),yes)
_ASTCFLAGS+=-Wshadow
endif
Modified: team/twilson/config_work/configure.ac
URL: http://svnview.digium.com/svn/asterisk/team/twilson/config_work/configure.ac?view=diff&rev=366649&r1=366648&r2=366649
==============================================================================
--- team/twilson/config_work/configure.ac (original)
+++ team/twilson/config_work/configure.ac Wed May 16 10:45:32 2012
@@ -980,6 +980,16 @@
fi
AC_SUBST(AST_DECLARATION_AFTER_STATEMENT)
+AC_MSG_CHECKING(for -Wtrampolines support)
+if $(${CC} -Wtrampolines -S -o /dev/null -xc /dev/null > /dev/null 2>&1); then
+ AC_MSG_RESULT(yes)
+ AST_DECLARATION_AFTER_STATEMENT=-Wtrampolines
+else
+ AC_MSG_RESULT(no)
+ AST_DECLARATION_AFTER_STATEMENT=
+fi
+AC_SUBST(AST_DECLARATION_AFTER_STATEMENT)
+
AC_MSG_CHECKING(for _FORTIFY_SOURCE support)
if $(${CC} -D_FORTIFY_SOURCE=2 -S -o /dev/null -xc /dev/null > /dev/null 2>&1); then
AC_MSG_RESULT(yes)
More information about the svn-commits
mailing list