a994041db3
Currently, even when built with --enable-build-with-cxx, gdb uses CFLAGS instead of CXXFLAGS. This commit fixes it. CXXFLAGS set in the environment when configure was run is now honored in the generated gdb/Makefile, and you can also override CXXFLAGS in the command like at make time, with the usual 'make CXXFLAGS="..."' Objects built with a C compiler (e.g., gnulib) still honor CFLAGS instead. gdb/ChangeLog: 2016-01-21 Pedro Alves <palves@redhat.com> * Makefile.in (COMPILER_CFLAGS): New. (CXXFLAGS): Get it from configure. (INTERNAL_CFLAGS_BASE, INTERNAL_LDFLAGS): Use COMPILER_CFLAGS instead of CFLAGS. * build-with-cxx.m4 (GDB_AC_BUILD_WITH_CXX): Set and AC_SUBST COMPILER_CFLAGS. * configure: Regenerate. gdb/gdbserver/ChangeLog: 2016-01-21 Pedro Alves <palves@redhat.com> * Makefile.in (COMPILER_CFLAGS, CXXFLAGS): New. (INTERNAL_CFLAGS_BASE): Use COMPILER_CFLAGS instead of CFLAGS. * configure: Regenerate.
43 lines
1.4 KiB
Text
43 lines
1.4 KiB
Text
dnl Copyright (C) 2014-2016 Free Software Foundation, Inc.
|
|
dnl
|
|
dnl This file is part of GDB.
|
|
dnl
|
|
dnl This program is free software; you can redistribute it and/or modify
|
|
dnl it under the terms of the GNU General Public License as published by
|
|
dnl the Free Software Foundation; either version 3 of the License, or
|
|
dnl (at your option) any later version.
|
|
dnl
|
|
dnl This program is distributed in the hope that it will be useful,
|
|
dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
dnl GNU General Public License for more details.
|
|
dnl
|
|
dnl You should have received a copy of the GNU General Public License
|
|
dnl along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
dnl GDB_AC_BUILD_WITH_CXX()
|
|
dnl Provide an --enable-build-with-cxx/--disable-build-with-cxx set of options
|
|
dnl allowing a user to build with a C++ compiler.
|
|
|
|
AC_DEFUN([GDB_AC_BUILD_WITH_CXX],
|
|
[
|
|
AC_ARG_ENABLE(build-with-cxx,
|
|
AS_HELP_STRING([--enable-build-with-cxx], [build with C++ compiler instead of C compiler]),
|
|
[case $enableval in
|
|
yes | no)
|
|
;;
|
|
*)
|
|
AC_MSG_ERROR([bad value $enableval for --enable-build-with-cxx]) ;;
|
|
esac],
|
|
[enable_build_with_cxx=no])
|
|
|
|
if test "$enable_build_with_cxx" = "yes"; then
|
|
COMPILER='$(CXX)'
|
|
COMPILER_CFLAGS='$(CXXFLAGS)'
|
|
else
|
|
COMPILER='$(CC)'
|
|
COMPILER_CFLAGS='$(CFLAGS)'
|
|
fi
|
|
AC_SUBST(COMPILER)
|
|
AC_SUBST(COMPILER_CFLAGS)
|
|
])
|