diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index e21e4033b9087..0fe3796c00b7f 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -72,10 +72,13 @@ stdenv.targetPlatform.isWindows || stdenv.targetPlatform.isGhcjs # Before , - # we couldn't force hadrian to build terminfo for cross. + # we couldn't force hadrian to build terminfo for different triples. || ( lib.versionOlder version "9.15.20250808" - && (stdenv.buildPlatform != stdenv.hostPlatform || stdenv.hostPlatform != stdenv.targetPlatform) + && ( + stdenv.buildPlatform.config != stdenv.hostPlatform.config + || stdenv.hostPlatform.config != stdenv.targetPlatform.config + ) ) ), @@ -353,7 +356,9 @@ let inherit (stdenv) buildPlatform hostPlatform targetPlatform; # TODO(@Ericson2314) Make unconditional - targetPrefix = lib.optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-"; + targetPrefix = lib.optionalString ( + targetPlatform.config != hostPlatform.config + ) "${targetPlatform.config}-"; # TODO(@sternenseemann): there's no stage0:exe:haddock target by default, # so haddock isn't available for GHC cross-compilers. Can we fix that?