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 /Makefile | |
| 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
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 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 |