b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gcc.patches: For gcc49 apply libsanitizer-no-cyclades-9 patch later

Browse source 
otherwise there is a conflict
This commit is contained in:
Artturin 2023-09-02 21:48:08 +03:00
parent 62c676ce6f
commit 5c63f69ed2
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/development/compilers/gcc/patches/default.nix
View file

@ -200,7 +200,8 @@ in
## gcc 8.0 and older ##############################################################################
++ optional (atLeast49 && !atLeast9) ./libsanitizer-no-cyclades-9.patch
# for 49 this is applied later
++ optional (atLeast49 && !is49 && !atLeast9) ./libsanitizer-no-cyclades-9.patch
++ optional (is7 || is8) ./9/fix-struct-redefinition-on-glibc-2.36.patch
@ -250,6 +251,8 @@ in
url = "https://gitweb.gentoo.org/proj/gcc-patches.git/plain/4.9.4/gentoo/100_all_avoid-ustat-glibc-2.28.patch?id=55fcb515620a8f7d3bb77eba938aa0fcf0d67c96";
sha256 = "0b32sb4psv5lq0ij9fwhi1b4pjbwdjnv24nqprsk14dsc6xmi1g0";
})
# has to be applied after "avoid-ustat-glibc-2.28.patch"
./libsanitizer-no-cyclades-9.patch
# glibc-2.26
./struct-ucontext.patch
./struct-sigaltstack-4.9.patch