X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/06e0e52ca4450a00113d5a157e791363bf57de83..7fb72c6e53f25f2d0b10fc9e0b412b8c7cde9101:/tests/atlocal.in

diff --git a/tests/atlocal.in b/tests/atlocal.in
index 8f5b1a90..72a9bf75 100644
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -16,30 +16,47 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# We need a C compiler.
+# We need `config.h'.
+CPPFLAGS="-I$abs_top_builddir/lib @CPPFLAGS@"
+
+## ------------------- ##
+## C/C++ Compilation.  ##
+## ------------------- ##
+
 : ${CC='@CC@'}
+: ${CXX='@CXX@'}
+
+# Is the compiler GCC?
+GCC='@GCC@'
 
 # We want no optimization.
-CFLAGS='@O0CFLAGS@ @WARN_CFLAGS_TEST@ @WERROR_CFLAGS@'
+  O0CFLAGS=`echo '@CFLAGS@'   | sed 's/-O[0-9] *//'`
+O0CXXFLAGS=`echo '@CXXFLAGS@' | sed 's/-O[0-9] *//'`
 
 # Sometimes a test group needs to ignore gcc warnings, so it locally
 # sets CFLAGS to this.
-NO_WERROR_CFLAGS='@O0CFLAGS@ @WARN_CFLAGS_TEST@'
+  NO_WERROR_CFLAGS="$O0CFLAGS   @WARN_CFLAGS@   @WARN_CFLAGS_TEST@"
+NO_WERROR_CXXFLAGS="$O0CXXFLAGS @WARN_CXXFLAGS@ @WARN_CXXFLAGS_TEST@"
 
-# We need `config.h'.
-CPPFLAGS="-I$abs_top_builddir/lib @CPPFLAGS@"
-
-# Is the compiler GCC?
-GCC='@GCC@'
-
-# The C++ compiler.
-: ${CXX='@CXX@'}
+# But most of the time, we want -Werror.
+  CFLAGS="$NO_WERROR_CFLAGS   @WERROR_CFLAGS@"
+CXXFLAGS="$NO_WERROR_CXXFLAGS @WERROR_CXXFLAGS@"
 
 # If 'exit 77'; skip all C++ tests; otherwise ':'.
 BISON_CXX_WORKS='@BISON_CXX_WORKS@'
 
-# We want no optimization with C++, too.
-CXXFLAGS='@O0CXXFLAGS@ @WARN_CXXFLAGS_TEST@ @WERROR_CFLAGS@'
+# Handle --compile-c-with-cxx here, once CXX and CXXFLAGS are known.
+if "$at_arg_compile_c_with_cxx"; then
+  CC=$CXX
+  O0CFLAGS=$O0CXXFLAGS
+  NO_WERROR_CFLAGS=$NO_WERROR_CXXFLAGS
+  CFLAGS=$CXXFLAGS
+fi
+
+
+## ------- ##
+## Other.  ##
+## ------- ##
 
 # Are special link options needed?
 LDFLAGS='@LDFLAGS@'