Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nix
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 03d8136b02e8
Choose a base ref
...
head repository: NixOS/nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: bed22114bf9c
Choose a head ref
  • 2 commits
  • 3 files changed
  • 2 contributors

Commits on Mar 20, 2018

  1. ask autotools for c++14 support flags, not c++11; don't override later

    @dtzWill
    dtzWill committed Mar 20, 2018
    3

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    jonringer Jonathan Ringer
    GPG key ID: 5C841D3CFDFEC4E0
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    dc99ea4 View commit details

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

    ask autotools for c++14 support flags, not c++11; don't override later
    @edolstra
    edolstra authored Mar 20, 2018
    Copy the full SHA
    bed2211 View commit details
Showing with 3 additions and 3 deletions.
  1. +1 −1 Makefile
  2. +1 −1 configure.ac
  3. +1 −1 perl/Makefile
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
@@ -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

2 changes: 1 addition & 1 deletion configure.ac
View file
Original file line number Diff line number Diff line change
@@ -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.
2 changes: 1 addition & 1 deletion perl/Makefile
View file
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