From: Michael Jeanson Date: Tue, 2 May 2017 21:40:45 +0000 (-0400) Subject: Fix: Don't override user variables within the build system X-Git-Tag: v0.10.0~9 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=9a79c612003362a97217613b7906a4782977d373;p=urcu.git Fix: Don't override user variables within the build system 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 Fixes #1095 Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers --- diff --git a/configure.ac b/configure.ac index ba7538d..5aa3433 100644 --- a/configure.ac +++ b/configure.ac @@ -89,9 +89,6 @@ 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" # Checks for library functions. AC_FUNC_MMAP @@ -168,7 +165,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 @@ -367,8 +364,10 @@ AC_CHECK_FUNCS([sched_setaffinity],[ ]) ]) -DEFAULT_INCLUDES="-include config.h" -AC_SUBST(DEFAULT_INCLUDES) +AM_CPPFLAGS="-include config.h" +AC_SUBST(AM_CPPFLAGS) + +AC_SUBST(AM_CFLAGS) AC_CONFIG_LINKS([ include/urcu/arch.h:$ARCHSRC diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am index 88f8968..734582a 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)/include/ -I$$rel_src_subdir/$(top_srcdir)/src/ -I$$rel_build_subdir$(top_builddir)/include/ -I$$rel_build_subdir$(top_builddir)/include/src/" AM_CFLAGS='$(CFLAGS)' AM_LDFLAGS='$(LDFLAGS) -L../../../src/.libs/ -Wl,-rpath "$(PWD)/../../src/.libs/"' $(AM_MAKEFLAGS) all; + $(MAKE) -f dist-files/Makefile CC="$(CC)" CPPFLAGS="$(CPPLAGS)" AM_CPPFLAGS="$(AM_CPPFLAGS) -I"$${rel_src_subdir}/$(top_srcdir)/include/" -I"$${rel_src_subdir}/$(top_srcdir)/src/" -I"$${rel_build_subdir}$(top_builddir)/include/" -I"$${rel_build_subdir}$(top_builddir)/include/src/"" CFLAGS="$(CFLAGS)" AM_CFLAGS="$(AM_CFLAGS) $(PTHREAD_CFLAGS)" LDFLAGS="$(LDFLAGS)" AM_LDFLAGS="$(AM_LDFLAGS) -L../../../src/.libs/ -Wl,-rpath "$(PWD)/../../src/.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/src/Makefile.am b/src/Makefile.am index 6a2fd7a..776c2a3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src +AM_CPPFLAGS += -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src #Add the -version-info directly here since we are only building # library that use the version-info @@ -6,7 +6,7 @@ AM_LDFLAGS=-version-info $(URCU_LIBRARY_VERSION) if USE_CYGWIN AM_LDFLAGS+=-no-undefined endif -AM_CFLAGS=-Wall +AM_CFLAGS+=-Wall include_HEADERS = urcu.h urcu-bp.h urcu-call-rcu.h urcu-defer.h \ urcu-pointer.h urcu-qsbr.h urcu-flavor.h @@ -44,11 +44,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/tests/benchmark/Makefile.am b/tests/benchmark/Makefile.am index 0c3fd77..9899f54 100644 --- a/tests/benchmark/Makefile.am +++ b/tests/benchmark/Makefile.am @@ -1,4 +1,4 @@ -AM_CFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src -I$(top_srcdir)/tests/common -g +AM_CFLAGS += $(PTHREAD_CFLAGS) -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src -I$(top_srcdir)/tests/common -g SCRIPT_LIST = common.sh \ run.sh \ diff --git a/tests/common/Makefile.am b/tests/common/Makefile.am index d919ca1..5935098 100644 --- a/tests/common/Makefile.am +++ b/tests/common/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src +AM_CPPFLAGS += -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src noinst_HEADERS = cpuset.h thread-id.h diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am index aa7a00c..328dcf4 100644 --- a/tests/regression/Makefile.am +++ b/tests/regression/Makefile.am @@ -1,4 +1,4 @@ -AM_CFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src -I$(top_srcdir)/tests/utils -I$(top_srcdir)/tests/common -g +AM_CFLAGS += $(PTHREAD_CFLAGS) -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src -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 54eb9f3..ce9d1b2 100644 --- a/tests/unit/Makefile.am +++ b/tests/unit/Makefile.am @@ -1,4 +1,4 @@ -AM_CFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src -I$(top_srcdir)/tests/utils -I$(top_srcdir)/tests/common -g +AM_CFLAGS += $(PTHREAD_CFLAGS) -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src -I$(top_srcdir)/tests/utils -I$(top_srcdir)/tests/common -g SCRIPT_LIST = test_loop run.sh unit_tests diff --git a/tests/utils/Makefile.am b/tests/utils/Makefile.am index 440ac38..31d7913 100644 --- a/tests/utils/Makefile.am +++ b/tests/utils/Makefile.am @@ -1,4 +1,4 @@ -AM_CFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src +AM_CFLAGS += -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src noinst_LIBRARIES = libtap.a libtap_a_SOURCES = tap.c tap.h