summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2016-02-15 23:44:43 -0800
committerH. Peter Anvin <hpa@linux.intel.com>2016-02-15 23:44:43 -0800
commitc44bfaa05485556c025fe10ccd04a80ee61a93dd (patch)
tree7ff6183a0aed2f2121e3a4d6b41dc70a4586c5a2
parentddf424758c7db547e76c1739c67e5bc5a0a0ff1b (diff)
parentec3d426e363d07c8a582ff7cf5a31b5e99576ec3 (diff)
downloadnasm-c44bfaa05485556c025fe10ccd04a80ee61a93dd.tar.gz
Merge branch 'master' of git://repo.or.cz/nasm
-rw-r--r--configure.in23
1 files changed, 12 insertions, 11 deletions
diff --git a/configure.in b/configure.in
index f3274263..023bd240 100644
--- a/configure.in
+++ b/configure.in
@@ -78,17 +78,6 @@ dnl If we have gcc, add appropriate options
PA_ADD_CFLAGS([-W])
PA_ADD_CFLAGS([-Wall])
PA_ADD_CFLAGS([-std=c99])
-PA_ADD_CFLAGS([-pedantic])
-PA_ADD_CFLAGS([-Werror=implicit])
-PA_ADD_CFLAGS([-Werror=missing-braces])
-PA_ADD_CFLAGS([-Werror=return-type])
-PA_ADD_CFLAGS([-Werror=trigraphs])
-PA_ADD_CFLAGS([-Werror=pointer-arith])
-PA_ADD_CFLAGS([-Werror=strict-prototypes])
-PA_ADD_CFLAGS([-Werror=missing-prototypes])
-PA_ADD_CFLAGS([-Werror=missing-declarations])
-PA_ADD_CFLAGS([-Werror=comment])
-PA_ADD_CFLAGS([-Werror=vla])
dnl Look for programs...
AC_CHECK_PROGS(NROFF, nroff, false)
@@ -192,5 +181,17 @@ AC_ARG_WITH([ccache],
[CC="ccache $CC"],
[])
+PA_ADD_CFLAGS([-pedantic])
+PA_ADD_CFLAGS([-Werror=implicit])
+PA_ADD_CFLAGS([-Werror=missing-braces])
+PA_ADD_CFLAGS([-Werror=return-type])
+PA_ADD_CFLAGS([-Werror=trigraphs])
+PA_ADD_CFLAGS([-Werror=pointer-arith])
+PA_ADD_CFLAGS([-Werror=strict-prototypes])
+PA_ADD_CFLAGS([-Werror=missing-prototypes])
+PA_ADD_CFLAGS([-Werror=missing-declarations])
+PA_ADD_CFLAGS([-Werror=comment])
+PA_ADD_CFLAGS([-Werror=vla])
+
AC_OUTPUT_COMMANDS([mkdir -p output])
AC_OUTPUT(Makefile rdoff/Makefile doc/Makefile)