From 61e9282556d68a123d25215e8c457b7953415ad2 Mon Sep 17 00:00:00 2001 From: Florian Krohm Date: Wed, 2 Oct 2013 15:14:59 +0000 Subject: [PATCH] The configury bits for checking the annotatoin of smart pointers were mixing up CFLAGS and CXXFLAGS. Now fixed. Also, when modifying CFLAGS also modify CXXFLAGS unless there is a good reason not to do so. This only affects compilation of testcases. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@13604 --- configure.ac | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index b3570cb44d..0223ee2075 100644 --- a/configure.ac +++ b/configure.ac @@ -19,6 +19,7 @@ AM_MAINTAINER_MODE # Checks for various programs. #---------------------------------------------------------------------------- CFLAGS="-Wno-long-long $CFLAGS" +CXXFLAGS="-Wno-long-long $CXXFLAGS" AC_PROG_LN_S AC_PROG_CC @@ -1520,6 +1521,7 @@ CFLAGS=$safe_CFLAGS if test x$no_write_strings = xyes; then CFLAGS="$CFLAGS -Wwrite-strings" + CXXFLAGS="$CXXFLAGS -Wwrite-strings" fi AM_CONDITIONAL(HAS_WRITE_STRINGS_WARNING, test x$no_write_strings = xyes) @@ -1669,6 +1671,7 @@ AC_SUBST(FLAG_FNO_STACK_PROTECTOR) if test x$no_stack_protector = xyes; then CFLAGS="$CFLAGS -fno-stack-protector" + CXXFLAGS="$CXXFLAGS -fno-stack-protector" fi @@ -2619,7 +2622,7 @@ AM_CONDITIONAL([ENABLE_LINUX_TICKET_LOCK_SECONDARY], # does libstdc++ support annotating shared pointers ? AC_MSG_CHECKING([if libstdc++ supports annotating shared pointers]) -safe_CXXFLAGS=$CFLAGS +safe_CXXFLAGS=$CXXFLAGS CXXFLAGS="-std=c++0x" AC_LANG_PUSH(C++) -- 2.47.2