Merge pull request #7805 from edolstra/c++2a

Fix building with GCC 9
2024-11-25 08:12:29 +00:00 · 2023-02-10 20:41:29 +01:00 · 2023-02-10 20:41:29 +01:00 · b3d29e80e0
commit b3d29e80e0
parent 67451d8ed7 5978ceb271
6 changed files with 6 additions and 6 deletions
--- a/2
+++ b/2
@ -36,4 +36,4 @@ endif

 include mk/lib.mk

-GLOBAL_CXXFLAGS += -g -Wall -include config.h -std=c++20 -I src
+GLOBAL_CXXFLAGS += -g -Wall -include config.h -std=c++2a -I src
--- a/perl/Makefile
+++ b/perl/Makefile
@ -1,6 +1,6 @@
 makefiles = local.mk

-GLOBAL_CXXFLAGS += -g -Wall -std=c++20 -I ../src
+GLOBAL_CXXFLAGS += -g -Wall -std=c++2a -I ../src

 -include Makefile.config

--- a/src/libcmd/nix-cmd.pc.in
+++ b/src/libcmd/nix-cmd.pc.in
@ -6,4 +6,4 @@ Name: Nix
 Description: Nix Package Manager
 Version: @PACKAGE_VERSION@
 Libs: -L${libdir} -lnixcmd
-Cflags: -I${includedir}/nix -std=c++20
+Cflags: -I${includedir}/nix -std=c++2a
--- a/src/libexpr/nix-expr.pc.in
+++ b/src/libexpr/nix-expr.pc.in
@ -7,4 +7,4 @@ Description: Nix Package Manager
 Version: @PACKAGE_VERSION@
 Requires: nix-store bdw-gc
 Libs: -L${libdir} -lnixexpr
-Cflags: -I${includedir}/nix -std=c++20
+Cflags: -I${includedir}/nix -std=c++2a
--- a/src/libmain/nix-main.pc.in
+++ b/src/libmain/nix-main.pc.in
@ -6,4 +6,4 @@ Name: Nix
 Description: Nix Package Manager
 Version: @PACKAGE_VERSION@
 Libs: -L${libdir} -lnixmain
-Cflags: -I${includedir}/nix -std=c++20
+Cflags: -I${includedir}/nix -std=c++2a
--- a/src/libstore/nix-store.pc.in
+++ b/src/libstore/nix-store.pc.in
@ -6,4 +6,4 @@ Name: Nix
 Description: Nix Package Manager
 Version: @PACKAGE_VERSION@
 Libs: -L${libdir} -lnixstore -lnixutil
-Cflags: -I${includedir}/nix -std=c++20
+Cflags: -I${includedir}/nix -std=c++2a