Merge pull request #1997 from dtzWill/fix/cxx14-std-consistency

ask autotools for c++14 support flags, not c++11; don't override later
2018-03-20 18:29:05 +01:00
parent 03d8136b02 dc99ea4483
commit bed22114bf
3 changed files with 3 additions and 3 deletions
@@ -25,7 +25,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

@@ -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.
@@ -1,6 +1,6 @@
 makefiles = local.mk

-GLOBAL_CXXFLAGS += -std=c++14 -g -Wall
+GLOBAL_CXXFLAGS += -g -Wall

 -include Makefile.config