lix-project/lix
20
57
Fork 31
Code Issues 350 Code Review (Gerrit) Projects 3 Releases Wiki Activity

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

Browse source 
ask autotools for c++14 support flags, not c++11; don't override later
This commit is contained in:
Eelco Dolstra 2018-03-20 18:29:05 +01:00 committed by GitHub
parent 03d8136b02 dc99ea4483
commit bed22114bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -25,7 +25,7 @@ makefiles = \
tests/local.mk \ tests/local.mk \
tests/plugins/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 -include Makefile.config

2
configure.ac
View file

@ -62,7 +62,7 @@ CXXFLAGS=
AC_PROG_CC AC_PROG_CC
AC_PROG_CXX AC_PROG_CXX
AC_PROG_CPP 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. # Use 64-bit file system calls so that we can support files > 2 GiB.

2
perl/Makefile
View file

@ -1,6 +1,6 @@
makefiles = local.mk makefiles = local.mk
GLOBAL_CXXFLAGS += -std=c++14 -g -Wall GLOBAL_CXXFLAGS += -g -Wall
-include Makefile.config -include Makefile.config