summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alves <palves@redhat.com>2020-01-15 21:55:29 +0000
committerPedro Alves <palves@redhat.com>2020-01-17 15:19:42 +0000
commit67b10306d19bd16ec9f3ca73b14aa82c789436e1 (patch)
treee5627ab3c76d7a0afeb226516a8bdf3f89debeda
parent3684d331fd35f49e4022ac6906dc879552af0442 (diff)
downloadbinutils-gdb-67b10306d19bd16ec9f3ca73b14aa82c789436e1.tar.gz
Fix gdbsupport build on compilers that don't default to C++11 or above
gdbsupport fails to build with compilers that don't default to C++11 or above. gdbsupport's configure.ac is already using AX_CXX_COMPILE_STDCXX, which sets CXX_DIALECT to the -std=gnu++11 switch if necessary, but the problem is that nowhere are we using CXX_DIALECT. This fixes it. gdbsupport/ChangeLog: 2020-01-17 Pedro Alves <palves@redhat.com> * Makefile.am: Append CXX_DIALECT to CXX. * Makefile.in: Regenerate.
-rw-r--r--gdbsupport/ChangeLog5
-rw-r--r--gdbsupport/Makefile.am2
-rw-r--r--gdbsupport/Makefile.in2
3 files changed, 9 insertions, 0 deletions
diff --git a/gdbsupport/ChangeLog b/gdbsupport/ChangeLog
index e7a902760f7..3583e5bd347 100644
--- a/gdbsupport/ChangeLog
+++ b/gdbsupport/ChangeLog
@@ -1,3 +1,8 @@
+2020-01-17 Pedro Alves <palves@redhat.com>
+
+ * Makefile.am: Append CXX_DIALECT to CXX.
+ * Makefile.in: Regenerate.
+
2020-01-17 Pedro Alves <palves@redhat.com>
* configure.ac: Generate config.h instead of support-config.h.
diff --git a/gdbsupport/Makefile.am b/gdbsupport/Makefile.am
index 1a001a00817..4b8a604ce52 100644
--- a/gdbsupport/Makefile.am
+++ b/gdbsupport/Makefile.am
@@ -24,6 +24,8 @@ AM_CPPFLAGS = -I$(srcdir)/../include -I$(srcdir)/../gdb \
-I../gnulib/import -I$(srcdir)/../gnulib/import \
-I.. -I$(srcdir)/.. $(INCINTL) -I../bfd -I$(srcdir)/../bfd
+override CXX += $(CXX_DIALECT)
+
override CC := $(CXX)
override CFLAGS := $(CXXFLAGS)
diff --git a/gdbsupport/Makefile.in b/gdbsupport/Makefile.in
index 5bbab1c310e..31065af2440 100644
--- a/gdbsupport/Makefile.in
+++ b/gdbsupport/Makefile.in
@@ -688,6 +688,8 @@ uninstall-am:
.PRECIOUS: Makefile
+override CXX += $(CXX_DIALECT)
+
override CC := $(CXX)
override CFLAGS := $(CXXFLAGS)