Fix ghc-iserv for profiling

input-output-hk · Mar 15, 2024 · f4c9691 · f4c9691
1 parent 9dbf6c8
commit f4c9691
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/builder/ghc-for-component-wrapper.nix b/builder/ghc-for-component-wrapper.nix
@@ -127,6 +127,7 @@ let
   ''
   + lib.optionalString (stdenv.targetPlatform.isMusl && !haskellLib.isNativeMusl && builtins.compareVersions ghc.version "9.9" >0) ''
      ln -s $wrappedGhc/bin/${ghcCommand}-iserv $wrappedGhc/bin/ghc-iserv
+     ln -s $wrappedGhc/bin/${ghcCommand}-iserv-prof $wrappedGhc/bin/ghc-iserv-prof
   ''
   # Wrap haddock, if the base GHC provides it.
   + ''

diff --git a/compiler/ghc/default.nix b/compiler/ghc/default.nix
@@ -774,17 +774,8 @@ stdenv.mkDerivation (rec {
     ${hadrian}/bin/hadrian ${hadrianArgs} stage1:lib:terminfo
   '' + lib.optionalString (installStage1 && !haskell-nix.haskellLib.isCrossTarget) ''
     ${hadrian}/bin/hadrian ${hadrianArgs} stage2:exe:iserv
-    ${
-      # This work around for building `ghc-iserv-prof` does not work with the current ghc HEAD
-      lib.optionalString (builtins.compareVersions ghc-version "9.9" < 0)
-      
-      # I don't seem to be able to build _build/stage1/lib/bin/ghc-iserv-prof
-      # by asking hadrian for this. The issue is likely that the profiling way
-      # is probably missing from hadrian m(
-      ''
-      ${hadrian}/bin/hadrian ${hadrianArgs} _build/stage1/lib/bin/ghc-iserv-prof
-      ''
-    }
+    ${hadrian}/bin/hadrian ${hadrianArgs} _build/stage1/${
+        lib.optionalString (builtins.compareVersions ghc-version "9.9" < 0) "lib/"}bin/ghc-iserv-prof
     pushd _build/stage1/bin
     for exe in *; do
       mv $exe ${targetPrefix}$exe