Skip to content

Commit d2de7c4

Browse files
committed
GCC14 compat: Narrower, more cross-GCC warning disablement
- moira only actually needs to disable one of the three warnings, so do that - Older GCC doesn't know about return-mismatch (https://gcc.gnu.org/gcc-14/porting_to.html#return-mismatch), so we need to use the -Wno-return-mismatch form to compile with older GCC (see https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html), not -Wno-error=return-mismatch (which generates an unknown warning error)
1 parent 7cd63cf commit d2de7c4

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

pkgs/discuss.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ in stdenv.mkDerivation {
1717
};
1818

1919
env = {
20-
NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration -Wno-error=implicit-int -Wno-error=return-mismatch";
20+
NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration -Wno-error=implicit-int -Wno-return-mismatch";
2121
};
2222

2323
meta = with lib; {

pkgs/moira.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
2121
sourceRoot = "source/moira";
2222

2323
env = {
24-
NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration -Wno-error=implicit-int -Wno-error=return-mismatch";
24+
NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
2525
};
2626

2727
meta = with lib; {

0 commit comments

Comments
 (0)