diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2022-10-09 11:37:29 +0200 |
|---|---|---|
| committer | Maximilian Bosch <maximilian@mbosch.me> | 2023-03-28 20:17:48 +0200 |
| commit | 11e011cdce3214009ab9b1c7534ddc863ac659ac (patch) | |
| tree | 55a92cc73cab29200ba3b5ecb2c5ffa242818285 | |
| parent | xorg.xdm: fix build w/glibc-2.36 (diff) | |
| download | nixpkgs-origin/glibc-2.36.tar.gz | |
gccgo6: fix build w/glibc-2.36origin/glibc-2.36
Failing Hydra build: https://hydra.nixos.org/build/193810432
| -rw-r--r-- | pkgs/development/compilers/gcc/6/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/compilers/gcc/6/gogcc-workaround-glibc-2.36.patch | 14 |
2 files changed, 15 insertions, 0 deletions
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index cd45ac0354a0..1c0f727cbb98 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -78,6 +78,7 @@ let majorVersion = "6"; ++ optional langAda ./gnat-glibc234.patch ++ optional langFortran ../gfortran-driving.patch ++ optional (targetPlatform.libc == "musl") ../libgomp-dont-force-initial-exec.patch + ++ optional langGo ./gogcc-workaround-glibc-2.36.patch # Obtain latest patch with ../update-mcfgthread-patches.sh ++ optional (!crossStageStatic && targetPlatform.isMinGW && threadsCross.model == "mcf") ./Added-mcf-thread-model-support-from-mcfgthread.patch diff --git a/pkgs/development/compilers/gcc/6/gogcc-workaround-glibc-2.36.patch b/pkgs/development/compilers/gcc/6/gogcc-workaround-glibc-2.36.patch new file mode 100644 index 000000000000..bc11f990e5e9 --- /dev/null +++ b/pkgs/development/compilers/gcc/6/gogcc-workaround-glibc-2.36.patch @@ -0,0 +1,14 @@ +diff --git a/libgo/mksysinfo.sh b/libgo/mksysinfo.sh +index dd456e907..24e607c7b 100755 +--- a/libgo/mksysinfo.sh ++++ b/libgo/mksysinfo.sh +@@ -148,9 +148,6 @@ cat > sysinfo.c <<EOF + #if defined(HAVE_LINUX_ETHER_H) + #include <linux/ether.h> + #endif +-#if defined(HAVE_LINUX_FS_H) +-#include <linux/fs.h> +-#endif + #if defined(HAVE_LINUX_REBOOT_H) + #include <linux/reboot.h> + #endif |