From dc99ea4483e8500d8ffe3015abf3a891d3d19559 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 20 Mar 2018 11:25:13 -0500 Subject: [PATCH] ask autotools for c++14 support flags, not c++11; don't override later --- Makefile | 2 +- configure.ac | 2 +- perl/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index c47603731..bf709abe4 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ makefiles = \ tests/local.mk \ tests/plugins/local.mk -GLOBAL_CXXFLAGS += -std=c++14 -g -Wall -include config.h +GLOBAL_CXXFLAGS += -g -Wall -include config.h -include Makefile.config diff --git a/configure.ac b/configure.ac index 54322d463..7177c8914 100644 --- a/configure.ac +++ b/configure.ac @@ -62,7 +62,7 @@ CXXFLAGS= AC_PROG_CC AC_PROG_CXX AC_PROG_CPP -AX_CXX_COMPILE_STDCXX_11 +AX_CXX_COMPILE_STDCXX_14 # Use 64-bit file system calls so that we can support files > 2 GiB. diff --git a/perl/Makefile b/perl/Makefile index 684a37e81..284c75022 100644 --- a/perl/Makefile +++ b/perl/Makefile @@ -1,6 +1,6 @@ makefiles = local.mk -GLOBAL_CXXFLAGS += -std=c++14 -g -Wall +GLOBAL_CXXFLAGS += -g -Wall -include Makefile.config