aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Fritiofson <andreas.fritiofson@gmail.com>2016-11-06 15:49:35 +0100
committerPaul Fertser <fercerpav@gmail.com>2016-12-08 15:15:27 +0000
commitef4c139ce224e4d3784bcff411604c1908b13da6 (patch)
tree7460d0f8459ced3b4d3aa24c4ec5db078b7e4483
parent1789445c8283521951543d5a130fbf10b3594705 (diff)
configure: Don't set user variables
CFLAGS is a user variable and shouldn't be set in either configure.ac or Makefile.am because that makes it impossible to override compiler flags at configure or make time. AC_SUBST the default warning flags into AM_CFLAGS instead, which is emitted before CFLAGS on the compiler command line. Do the same thing with a mingw-specific flag as well. Change-Id: I6ac3a3c8b7e0abf6f0e60ea239b549d68ea6d370 Signed-off-by: Andreas Fritiofson <andreas.fritiofson@gmail.com> Reviewed-on: http://openocd.zylin.com/3870 Tested-by: jenkins Reviewed-by: Paul Fertser <fercerpav@gmail.com>
-rw-r--r--common.mk5
-rw-r--r--configure.ac4
2 files changed, 6 insertions, 3 deletions
diff --git a/common.mk b/common.mk
index f301c3ac..dbacf19f 100644
--- a/common.mk
+++ b/common.mk
@@ -1,6 +1,9 @@
# common flags used in openocd build
-AM_CPPFLAGS = -I$(top_srcdir)/src \
+AM_CFLAGS = $(GCC_WARNINGS)
+
+AM_CPPFLAGS = $(HOST_CPPFLAGS)\
+ -I$(top_srcdir)/src \
-I$(top_builddir)/src \
-I$(top_srcdir)/src/helper \
-DPKGDATADIR=\"$(pkgdatadir)\" \
diff --git a/configure.ac b/configure.ac
index e178d451..50585247 100644
--- a/configure.ac
+++ b/configure.ac
@@ -471,7 +471,7 @@ AS_CASE([$host],
AC_MSG_ERROR([buspirate currently not supported by MinGW32 hosts])
])
- CFLAGS="$CFLAGS -D__USE_MINGW_ANSI_STDIO"
+ AC_SUBST([HOST_CPPFLAGS], [-D__USE_MINGW_ANSI_STDIO])
AC_DEFINE([IS_MINGW], [1], [1 if building for MinGW.])
AC_DEFINE([IS_WIN32], [1], [1 if building for Win32.])
@@ -785,7 +785,7 @@ AS_IF([test "x${gcc_werror}" = "xyes"], [
# overide default gcc cflags
AS_IF([test "x$gcc_warnings" = "xyes"], [
- CFLAGS="$CFLAGS $GCC_WARNINGS"
+ AC_SUBST([GCC_WARNINGS], [$GCC_WARNINGS])
])
AC_CONFIG_FILES([