Skip to content

Commit 5031fa0

Browse files
authored
Add pre-requisite patch for musl (input-output-hk#2167)
The patches for hidden symbols, are applied to windows and musl, but we need a previous patch for this to apply cleanly.
1 parent e38b80d commit 5031fa0

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

overlays/bootstrap.nix

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,9 +265,10 @@ in {
265265
++ final.lib.optional (versionAtLeast "9.0" && final.stdenv.targetPlatform.isAarch64) ./patches/ghc/ghc-9.0-aarch64-handle-none-rela.patch
266266
++ final.lib.optional (versionAtLeast "9.6.3" && versionLessThan "9.6.4" && final.stdenv.targetPlatform.isWindows) ./patches/ghc/ghc-9.6-hadrian-splitsections.patch
267267
++ final.lib.optional (versionAtLeast "9.8.1" && versionLessThan "9.9" && final.stdenv.targetPlatform.isWindows) ./patches/ghc/ghc-9.6-hadrian-splitsections.patch
268-
# this patch was backported to 9.4.8
268+
# this patch was backported to 9.4.8 and 9.6.4
269269
++ final.lib.optional (versionAtLeast "9.4" && versionLessThan "9.4.8" && final.stdenv.targetPlatform.isWindows) ./patches/ghc/ghc-9.6-fix-code-symbol-jumps.patch
270-
++ final.lib.optional (versionAtLeast "9.6" && versionLessThan "9.6.4" && final.stdenv.targetPlatform.isWindows) ./patches/ghc/ghc-9.6-fix-code-symbol-jumps.patch
270+
# we also want to apply this to musl, so that the ./patches/ghc/ghc-9.6-0006-Adds-support-for-Hidden-symbols.patch applies.
271+
++ final.lib.optional (versionAtLeast "9.6" && versionLessThan "9.6.4" && (final.stdenv.targetPlatform.isWindows || final.stdenv.targetPlatform.isMusl)) ./patches/ghc/ghc-9.6-fix-code-symbol-jumps.patch
271272
++ final.lib.optional (versionAtLeast "9.8" && versionLessThan "9.9.20231203" && final.stdenv.targetPlatform.isWindows) ./patches/ghc/ghc-9.6-fix-code-symbol-jumps.patch
272273
# this one is to allow linking extra symbols from iserv.
273274
# ++ fromUntil "9.6.1" "9.10" ./patches/ghc/iserv-syms.patch

0 commit comments

Comments
 (0)