Fix: Don't use CFLAGS in configure script
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 5 lines · ----- On Apr 19, 2017, at 4:47 PM, Michael Jeanson [email protected] wrote:
Instead use the appropriatly prefixed
AM_CFLAGSas to not interfere when CFLAGS 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
This patch seems to work fine for a use case of:
./configure
make CFLAGS=-O3 V=1
but not for:
CFLAGS=-O3 ./configure
make V=1
In the latter case, all the subdirectories under doc/examples/ don't get the -O3 (they still get a -O2 -g here).
Can you investigate ?
Thanks,
Mathieu
Quoted 149 lines
Fixes #1095
Signed-off-by Michael Jeanson <[email protected]>---
configure.ac | 7 +++---- doc/examples/Makefile.am | 2 +- src/Makefile.am | 6 +++--- tests/benchmark/Makefile.am | 2 +- tests/regression/Makefile.am | 2 +- tests/unit/Makefile.am | 2 +- tests/utils/Makefile.am | 2 +- 7 files changed, 11 insertions(+), 12 deletions(-)configure.ac +0
-3@@ -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_MMAPconfigure.ac +0
-0@@ -168,7 +165,7 @@ AS_IF([test "x$SUBARCHTYPE" = xx86compat],[ ])AS_IF([test "$host_cpu" = "armv7l"],[
configure.ac +1
-1- CFLAGS="$CFLAGS -mcpu=cortex-a9 -mtune=cortex-a9 -O1" + AM_CFLAGS="$AM_CFLAGS -mcpu=cortex-a9 -mtune=cortex-a9 -O1"])
# ARM-specific checks
configure.ac +0
-0@@ -367,6 +364,8 @@ AC_CHECK_FUNCS([sched_setaffinity],[DEFAULT_INCLUDES="-include
config.h"AC_SUBST(DEFAULT_INCLUDES)configure.ac +2
-0+AC_SUBST(AM_CFLAGS) +AC_CONFIG_LINKS([
include/urcu/arch.h:$ARCHSRC
include/urcu/uatomic.h:$UATOMICSRCdoc/examples/Makefile.am +0
-4@@ -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;
doc/examples/Makefile.am +1
-3+ $(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='$(AM_CFLAGS)$(PTHREAD_CFLAGS)' 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; \src/Makefile.am +0
-0@@ -6,7 +6,7 @@ AM_LDFLAGS=-version-info $(URCU_LIBRARY_VERSION)if
USE_CYGWIN
AM_LDFLAGS+=-no-undefined
endifsrc/Makefile.am +1
-1-AM_CFLAGS=-Wall +AM_CFLAGS+=-Wall
include_HEADERS=urcu.hurcu-bp.hurcu-call-rcu.hurcu-defer.h\
urcu-pointer.hurcu-qsbr.hurcu-flavor.hsrc/Makefile.am +0
-0@@ -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.curcu-pointer.c$(COMPAT)src/Makefile.am +1
-1-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.curcu-pointer.c$(COMPAT)src/Makefile.am +1
-1-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.curcu-pointer.c$(COMPAT)tests/benchmark/Makefile.am +1
-3@@ -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 -gSCRIPT_LIST = common.sh \ run.sh \tests/regression/Makefile.am +1
-4@@ -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.shtests/unit/Makefile.am +1
-4@@ -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_looprun.shunit_teststests/utils/Makefile.am +1
-3@@ -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.alibtap_a_SOURCES=tap.ctap.h
--
2.7.4
Signature · 7 lines
Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com _______________________________________________ lttng-dev mailing list [email protected] https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev