git.iko.soy/haskell.nix
on iko/ghcjs-patch-master help sign in
Stage2 muslc only on x86 (#582)

Ideally we'd have equality on architecture here. For now special casing x86 will suffice.

commit0b1381b88d3eeb9652d9b998a3d979184e34c9aa authorMoritz Angermann <moritz.angermann@gmail.com> dateTue 5 May 2020, 11:58 (6 years ago) parentebb3815
1 file changed+2−2
compare with iko/ghcjs-patch-master
unifiedsplit
lib/default.nix+2−2
lib/default.nix+2−2
@@ -195,10 +195,10 @@ with haskellLib;
195195 # In most cases we do not want to treat musl as a cross compiler.
196196 # For instance when building ghc we want to include ghci.
197197 isCrossHost = stdenv.hostPlatform != stdenv.buildPlatform
198− && !(stdenv.buildPlatform.isLinux && stdenv.hostPlatform.isMusl);
198+ && !(stdenv.buildPlatform.isLinux && stdenv.hostPlatform.isMusl && stdenv.buildPlatform.isx86 && stdenv.hostPlatform.isx86);
199199 # This is the same as isCrossHost but for use when building ghc itself
200200 isCrossTarget = stdenv.targetPlatform != stdenv.hostPlatform
201− && !(stdenv.hostPlatform.isLinux && stdenv.targetPlatform.isMusl);
201+ && !(stdenv.hostPlatform.isLinux && stdenv.targetPlatform.isMusl && stdenv.hostPlatform.isx86 && stdenv.targetPlatform.isx86);
202202
203203 # Takes a version number or attr set of arguments (for cabalProject)
204204 # and conversios it to an attr set of argments. This allows