Skip to content

Commit a191d75

Browse files
committed
Revert "Add 9.6 linker to 8.10 windows"
This reverts commit 3ec62f3.
1 parent 8ee876b commit a191d75

15 files changed

+1
-13976
lines changed

overlays/bootstrap.nix

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ in {
7070
from = start: final.lib.optional (versionAtLeast start);
7171
until = end: final.lib.optional (versionLessThan end);
7272
always = final.lib.optional true;
73-
onDarwin = final.lib.optionals final.stdenv.targetPlatform.isDarwin;
73+
onDarwin = final.lib.optionals final.stdenv.targetPlatform.isDarwin;
7474
onMusl = final.lib.optionals final.stdenv.targetPlatform.isMusl;
7575
onWindows = final.lib.optionals final.stdenv.targetPlatform.isWindows;
7676
onWindowsOrMusl = final.lib.optionals (final.stdenv.targetPlatform.isWindows || final.stdenv.targetPlatform.isMusl);
@@ -260,20 +260,6 @@ in {
260260

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

0 commit comments

Comments
 (0)