[lttng-dev] [PATCH urcu stable-0.9 v2] Fix: Don't override user variables within the build system
Michael Jeanson
mjeanson at efficios.com
Mon May 8 19:57:00 UTC 2017
Instead use the appropriatly prefixed AM_* variables as to not interfere
when a user variable is passed to a make command. The proper use of flag
variables is documented at :
https://www.gnu.org/software/automake/manual/automake.html#Flag-Variables-Ordering
Signed-off-by: Michael Jeanson <mjeanson at efficios.com>
---
Makefile.am | 6 +++---
configure.ac | 12 ++++++------
doc/examples/Makefile.am | 2 +-
doc/examples/Makefile.examples.template | 9 +++------
tests/benchmark/Makefile.am | 2 +-
tests/regression/Makefile.am | 2 +-
tests/unit/Makefile.am | 2 +-
7 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 8e25fd9..529a99a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,7 +11,7 @@ endif
if USE_CYGWIN
AM_LDFLAGS+=-no-undefined
endif
-AM_CFLAGS=-Wall
+AM_CFLAGS+=-Wall
SUBDIRS = . doc tests
@@ -67,11 +67,11 @@ liburcu_qsbr_la_SOURCES = urcu-qsbr.c urcu-pointer.c $(COMPAT)
liburcu_qsbr_la_LIBADD = liburcu-common.la
liburcu_mb_la_SOURCES = urcu.c urcu-pointer.c $(COMPAT)
-liburcu_mb_la_CFLAGS = -DRCU_MB
+liburcu_mb_la_CFLAGS = -DRCU_MB $(AM_CFLAGS)
liburcu_mb_la_LIBADD = liburcu-common.la
liburcu_signal_la_SOURCES = urcu.c urcu-pointer.c $(COMPAT)
-liburcu_signal_la_CFLAGS = -DRCU_SIGNAL
+liburcu_signal_la_CFLAGS = -DRCU_SIGNAL $(AM_CFLAGS)
liburcu_signal_la_LIBADD = liburcu-common.la
liburcu_bp_la_SOURCES = urcu-bp.c urcu-pointer.c $(COMPAT)
diff --git a/configure.ac b/configure.ac
index eebed56..e56eb06 100644
--- a/configure.ac
+++ b/configure.ac
@@ -80,9 +80,8 @@ AS_IF([test "x$ax_cv___attribute__" = "xyes"],
[AC_MSG_ERROR([The compiler does not support __attribute__ extensions])])
AX_PTHREAD(,[AC_MSG_ERROR([Could not configure pthreads support])])
-LIBS="$PTHREAD_LIBS $LIBS"
-CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-CC="$PTHREAD_CC"
+
+AM_CFLAGS="$AM_CFLAGS $PTHREAD_CFLAGS"
# Checks for library functions.
AC_FUNC_MMAP
@@ -162,7 +161,7 @@ AS_IF([test "x$SUBARCHTYPE" = xx86compat],[
])
AS_IF([test "$host_cpu" = "armv7l"],[
- CFLAGS="$CFLAGS -mcpu=cortex-a9 -mtune=cortex-a9 -O1"
+ AM_CFLAGS="$AM_CFLAGS -mcpu=cortex-a9 -mtune=cortex-a9 -O1"
])
# ARM-specific checks
@@ -287,8 +286,8 @@ AS_IF([test "x$def_smp_support" = "xyes"], [AC_DEFINE([CONFIG_RCU_SMP], [1])])
# Since we define _GNU_SOURCE in the sources, must do so too in the
# autoconf tests, as defining _GNU_SOURCE or not exposes
# sched_setaffinity bits differently.
-saved_CFLAGS=$CFLAGS
-CFLAGS="$CFLAGS -D_GNU_SOURCE"
+saved_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS $AM_CFLAGS -D_GNU_SOURCE"
AC_CHECK_TYPES([cpu_set_t],
[have_cpu_set_t="yes"],
@@ -369,6 +368,7 @@ AC_CHECK_FUNCS([sched_setaffinity],[
])
CFLAGS=$saved_CFLAGS
+AC_SUBST(AM_CFLAGS)
AC_CONFIG_LINKS([
urcu/arch.h:$ARCHSRC
diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index 6828eee..76610bf 100644
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -145,7 +145,7 @@ all-local:
echo "Examples: relative top_builddir path $(top_builddir)"; \
rel_build_subdir="../"; \
fi; \
- $(MAKE) -f dist-files/Makefile AM_CC="$(CC)" AM_CPPFLAGS="$(CPPFLAGS) -I$$rel_src_subdir/$(top_srcdir)/ -I$$rel_build_subdir$(top_builddir)/" AM_CFLAGS='$(CFLAGS)' AM_LDFLAGS='$(LDFLAGS) -L../../../.libs/ -Wl,-rpath "$(PWD)/../../.libs/"' $(AM_MAKEFLAGS) all;
+ $(MAKE) -f dist-files/Makefile CC="$(CC)" CPPFLAGS="$(CPPLAGS)" AM_CPPFLAGS="$(AM_CPPFLAGS) -I$$rel_src_subdir/$(top_srcdir)/ -I$$rel_build_subdir$(top_builddir)/" CFLAGS="$(CFLAGS)" AM_CFLAGS="$(AM_CFLAGS) $(PTHREAD_CFLAGS)" LDFLAGS="$(LDFLAGS)" AM_LDFLAGS='$(AM_LDFLAGS) -L../../../.libs/ -Wl,-rpath "$(PWD)/../../.libs/"' $(AM_MAKEFLAGS) all;
clean-local:
@$(MAKE) -f dist-files/Makefile $(AM_MAKEFLAGS) clean; \
diff --git a/doc/examples/Makefile.examples.template b/doc/examples/Makefile.examples.template
index 6dd2bac..4b2378e 100644
--- a/doc/examples/Makefile.examples.template
+++ b/doc/examples/Makefile.examples.template
@@ -11,19 +11,16 @@
#
# This makefile is purposefully kept simple to support GNU and BSD make.
-ifdef AM_CC
-CC = $(AM_CC)
-endif
-CFLAGS = -g -O2 -Wall
+LOCAL_CFLAGS := -g -O2 -Wall
all: $(BINARY)
$(BINARY): $(OBJECTS)
- $(CC) $(CFLAGS) $(LDFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) \
+ $(CC) $(LOCAL_CFLAGS) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
-o $@ $(OBJECTS) $(LIBS)
$(OBJECTS): $(SOURCES) $(DEPS)
- $(CC) $(CPPFLAGS) $(CFLAGS) $(AM_CPPFLAGS) $(AM_CFLAGS) \
+ $(CC) $(LOCAL_CFLAGS) $(AM_CFLAGS) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) \
-c -o $@ $(SOURCES)
.PHONY: clean
diff --git a/tests/benchmark/Makefile.am b/tests/benchmark/Makefile.am
index 2326721..a3c3436 100644
--- a/tests/benchmark/Makefile.am
+++ b/tests/benchmark/Makefile.am
@@ -1,7 +1,7 @@
if !LIBC_INCLUDES_PTHREAD
AM_LDFLAGS=-lpthread
endif
-AM_CFLAGS=-I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/tests/common -g
+AM_CFLAGS+=$(PTHREAD_CFLAGS) -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/tests/common -g
SCRIPT_LIST = common.sh \
run.sh \
diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am
index 2376edc..ea42c9a 100644
--- a/tests/regression/Makefile.am
+++ b/tests/regression/Makefile.am
@@ -1,7 +1,7 @@
if !LIBC_INCLUDES_PTHREAD
AM_LDFLAGS=-lpthread
endif
-AM_CFLAGS=-I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/tests/utils -I$(top_srcdir)/tests/common -g
+AM_CFLAGS+=$(PTHREAD_CFLAGS) -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/tests/utils -I$(top_srcdir)/tests/common -g
SCRIPT_LIST = run.sh
diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
index 08a3cba..162848e 100644
--- a/tests/unit/Makefile.am
+++ b/tests/unit/Makefile.am
@@ -1,7 +1,7 @@
if !LIBC_INCLUDES_PTHREAD
AM_LDFLAGS=-lpthread
endif
-AM_CFLAGS=-I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/tests/utils -I$(top_srcdir)/tests/common -g
+AM_CFLAGS+=$(PTHREAD_CFLAGS) -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/tests/utils -I$(top_srcdir)/tests/common -g
SCRIPT_LIST = test_loop run.sh unit_tests
--
2.7.4
More information about the lttng-dev
mailing list