summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorBeniamino Galvani <bgalvani@redhat.com>2018-09-04 10:25:19 +0200
committerBeniamino Galvani <bgalvani@redhat.com>2018-09-18 15:15:31 +0200
commit51776b297e04dabb24b7b645744da7100f85ff2e (patch)
treeecca0122202eda5aeb122b9482a0aa66a5391cd4 /configure.ac
parentd0c32a15a5ce1220a8079167f3b08b476273afda (diff)
downloadNetworkManager-51776b297e04dabb24b7b645744da7100f85ff2e.tar.gz
build: don't change CFLAGS from configure.ac
If configure.ac automatically adds compiler flags to CFLAGS, it becomes hard to override one of them for a specific target because CFLAGS is added last. It is better to use AM_CFLAGS. See [1]. [1] https://www.gnu.org/software/automake/manual/html_node/Flag-Variables-Ordering.html
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac5
1 files changed, 3 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index b3fc8b249f..e080d359cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1043,7 +1043,7 @@ else
more_logging_default=no
fi
-NM_COMPILER_WARNINGS(CFLAGS, ${more_warnings_default})
+NM_COMPILER_WARNINGS(AM_CFLAGS, ${more_warnings_default})
NM_COMPILER_FLAG(LIBSYSTEMD_NM_CFLAGS, "-Wno-gnu-variable-sized-type-not-at-end")
AC_SUBST(LIBSYSTEMD_NM_CFLAGS)
@@ -1051,7 +1051,7 @@ AC_SUBST(LIBSYSTEMD_NM_CFLAGS)
CC_CHECK_FLAGS_APPEND([with_cflags], [CFLAGS], [\
-fno-strict-aliasing \
])
-CFLAGS="$CFLAGS $with_cflags"
+AM_CFLAGS="$AM_CFLAGS $with_cflags"
AC_ARG_ENABLE(more-asserts,
AS_HELP_STRING([--enable-more-asserts],
@@ -1248,6 +1248,7 @@ fi
AM_CONDITIONAL(BUILD_DOCS, test "$build_docs" = "yes")
AM_CONDITIONAL(HAVE_DOCS, test "$build_docs" = "yes" -o "$use_pregen_docs" = "yes")
+AC_SUBST(AM_CFLAGS)
AC_CONFIG_FILES([
Makefile