Skip to content

Commit

Permalink
Add 9.6 linker to 8.10 windows
Browse files Browse the repository at this point in the history
  • Loading branch information
angerman committed Jul 8, 2024
1 parent 4fd7e26 commit 3ec62f3
Show file tree
Hide file tree
Showing 15 changed files with 13,976 additions and 1 deletion.
16 changes: 15 additions & 1 deletion overlays/bootstrap.nix
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ in {
from = start: final.lib.optional (versionAtLeast start);
until = end: final.lib.optional (versionLessThan end);
always = final.lib.optional true;
onDarwin = final.lib.optionals final.stdenv.targetPlatform.isDarwin;
onDarwin = final.lib.optionals final.stdenv.targetPlatform.isDarwin;
onMusl = final.lib.optionals final.stdenv.targetPlatform.isMusl;
onWindows = final.lib.optionals final.stdenv.targetPlatform.isWindows;
onWindowsOrMusl = final.lib.optionals (final.stdenv.targetPlatform.isWindows || final.stdenv.targetPlatform.isMusl);
Expand Down Expand Up @@ -260,6 +260,20 @@ in {

# Fix issue loading windows dll using `.dll.a` file
++ onWindows (fromUntil "9.4" "9.12" ./patches/ghc/ghc-9.10-windows-dll-dependent-symbol-type-fix.patch)
++ onWindows (fromUntil "8.10" "8.12" ./patches/ghc/ghc-9.2-windows-dll-dependent-symbol-type-fix.patch)
++ onWindows (fromUntil "8.10" "8.12" ./patches/ghc/0001-Graft-9.10.1-linker-in.patch)
++ onWindows (fromUntil "8.10" "8.12" ./patches/ghc/0002-Disable-ReportMemoryMap.patch)
++ onWindows (fromUntil "8.10" "8.12" ./patches/ghc/0003-StrHashTable-is-really-just-HashTable-facepalm.patch)
++ onWindows (fromUntil "8.10" "8.12" ./patches/ghc/0004-Add-includes-rts-Linker.h-as-well.patch)
++ onWindows (fromUntil "8.10" "8.12" ./patches/ghc/0005-Also-need-RtsSymbols.h.patch)
++ onWindows (fromUntil "8.10" "8.12" ./patches/ghc/0006-Also-need-pathutils.patch)
++ onWindows (fromUntil "8.10" "8.12" ./patches/ghc/0007-Can-not-have-RtsSymbols.h-without-RtsSymbols.c.patch)
++ onWindows (fromUntil "8.10" "8.12" ./patches/ghc/0008-Needs-linker_verbose-flag.patch)
++ onWindows (fromUntil "8.10" "8.12" ./patches/ghc/0009-Drop-non-existing-RtsSymbols.patch)
# ++ onWindows (fromUntil "8.10" "8.12" ./patches/ghc/0010-One-more-debug-flag-L.patch)
++ onWindows (fromUntil "8.10" "8.12" ./patches/ghc/0011-Add-ENVIRON-check.patch)
++ onWindows (fromUntil "8.10" "8.12" ./patches/ghc/0012-fixup-HAVE_DECL_ENVIRON.patch)
++ onWindows (fromUntil "8.10" "8.12" ./patches/ghc/0013-add-STG_NORETURN-to-Stg.h.patch)
;
in ({
ghc8107 = traceWarnOld "8.10" (final.callPackage ../compiler/ghc {
Expand Down
Loading

0 comments on commit 3ec62f3

Please sign in to comment.