diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2018-03-20T17·29+0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-20T17·29+0100 |
| commit | bed22114bf9c91077ac4d4ff7bb7084d94567383 (patch) | |
| tree | 0f0ca1c2dab3c93936a66217c747a30981153772 | |
| parent | 03d8136b02e8c5929dfc9db91214e34bdc8089be (diff) | |
| parent | dc99ea4483e8500d8ffe3015abf3a891d3d19559 (diff) | |
Merge pull request #1997 from dtzWill/fix/cxx14-std-consistency
ask autotools for c++14 support flags, not c++11; don't override later
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | perl/Makefile | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile index dbe864ec9bc9..834f84b286bf 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/configure.ac b/configure.ac index 54322d463ae7..7177c8914434 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 684a37e8121f..284c75022493 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 |