Skip to content

Commit

Permalink
ask autotools for c++14 support flags, not c++11; don't override later
Browse files Browse the repository at this point in the history
  • Loading branch information
dtzWill committed Mar 20, 2018
1 parent 21ebf6a commit dc99ea4
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion perl/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
makefiles = local.mk

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

-include Makefile.config

Expand Down

3 comments on commit dc99ea4

@dezgeg
Copy link
Contributor

@dezgeg dezgeg commented on dc99ea4 Mar 20, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that there was some problem with this previously: c0a1338#diff-67e997bcfdac55191033d57a16d1408a

@dtzWill
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Eep!

Well maybe let's see what Hydra says? At least debian8 is no longer supported (removed from release.nix), as of: 346aeee

@dtzWill
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Erm quick test shows the ubuntu/etc builds haven't been working since adding the dep for boost: https://hydra.nixos.org/jobset/nix/master#tabs-jobs

Dead canaries aren't quite as useful! xD

Please sign in to comment.