nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-29 19:30:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

haskell.compiler.ghc{96,98,910}: use emscripten installCC for ghcjs

Browse Source 
An oversight in 884a76c5e6: We need to
mirror the isGhcjs condition of targetCC (toolsForTarget) for installCC
as well. (Note that in practice, targetCC == installCC for ghcjs since
it is cross-only (?).)
This commit is contained in:
sternenseemann
2024-09-09 12:04:18 +02:00
parent 5cd41e16a6
commit 7fff04332d
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/compilers/ghc/common-hadrian.nix
View File

@@ -285,7 +285,10 @@ let
buildCC = buildPackages.stdenv.cc;
targetCC = builtins.head toolsForTarget;
installCC = pkgsHostTarget.targetPackages.stdenv.cc;
installCC =
if targetPlatform.isGhcjs
then pkgsHostTarget.emscripten
else pkgsHostTarget.targetPackages.stdenv.cc;
# toolPath calculates the absolute path to the name tool associated with a
# given `stdenv.cc` derivation, i.e. it picks the correct derivation to take