From: jason Date: Tue, 26 May 2015 13:12:14 +0000 (+0000) Subject: * configure.ac: Set CXXFLAGS for ISL test. X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2822b473a5cec95b032f21e0c01a53bc1719acfe;p=thirdparty%2Fgcc.git * configure.ac: Set CXXFLAGS for ISL test. * configure: Regenerate. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@223694 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 08f5586c55ad..cea5622e1bd0 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,8 @@ 2015-05-26 Jason Merrill + * configure.ac: Set CXXFLAGS for ISL test. + * configure: Regenerate. + * configure.ac: Use C++ for all tests. Use AC_CHECK_DECLS for strstr and basename. * configure: Regenerate. diff --git a/gcc/configure b/gcc/configure index 6d808be3c96e..a62f232f55d4 100755 --- a/gcc/configure +++ b/gcc/configure @@ -28286,8 +28286,8 @@ fi # Check whether isl_schedule_constraints_compute_schedule is available; # it's new in ISL-0.13. if test "x${ISLLIBS}" != "x" ; then - saved_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $ISLINC" + saved_CXXFLAGS="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS $ISLINC" saved_LIBS="$LIBS" LIBS="$LIBS $ISLLIBS $GMPLIBS" @@ -28315,7 +28315,7 @@ rm -f core conftest.err conftest.$ac_objext \ $as_echo "$ac_has_isl_schedule_constraints_compute_schedule" >&6; } LIBS="$saved_LIBS" - CFLAGS="$saved_CFLAGS" + CXXFLAGS="$saved_CXXFLAGS" if test x"$ac_has_isl_schedule_constraints_compute_schedule" = x"yes"; then diff --git a/gcc/configure.ac b/gcc/configure.ac index 5f9ed924fdb3..71b5f4f4c7f8 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -5712,8 +5712,8 @@ fi # Check whether isl_schedule_constraints_compute_schedule is available; # it's new in ISL-0.13. if test "x${ISLLIBS}" != "x" ; then - saved_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $ISLINC" + saved_CXXFLAGS="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS $ISLINC" saved_LIBS="$LIBS" LIBS="$LIBS $ISLLIBS $GMPLIBS" @@ -5725,7 +5725,7 @@ if test "x${ISLLIBS}" != "x" ; then AC_MSG_RESULT($ac_has_isl_schedule_constraints_compute_schedule) LIBS="$saved_LIBS" - CFLAGS="$saved_CFLAGS" + CXXFLAGS="$saved_CXXFLAGS" if test x"$ac_has_isl_schedule_constraints_compute_schedule" = x"yes"; then AC_DEFINE(HAVE_ISL_SCHED_CONSTRAINTS_COMPUTE_SCHEDULE, 1,