Fixes for musl and more materialized files

input-output-hk · Nov 28, 2022 · be5ef2c · be5ef2c
1 parent dba21e0
commit be5ef2c
Show file tree

Hide file tree

Showing 63 changed files with 13,429 additions and 59 deletions.
diff --git a/compiler/ghc/default.nix b/compiler/ghc/default.nix
@@ -210,11 +210,11 @@ let
       } --docs=no-sphinx -j -V";
 
   rootDir =
-    if targetPrefix == "x86_64-w64-mingw32-" && useHadrian
+    if (haskell-nix.haskellLib.isCrossTarget || targetPlatform.isMusl) && useHadrian
       then ""
       else "lib/${targetPrefix}ghc-${ghc-version}/";
   libDir =
-    if targetPrefix == "x86_64-w64-mingw32-" && useHadrian
+    if (haskell-nix.haskellLib.isCrossTarget || targetPlatform.isMusl) && useHadrian
       then "lib"
       else "lib/${targetPrefix}ghc-${ghc-version}" + lib.optionalString (useHadrian) "/lib";
 
@@ -589,7 +589,7 @@ stdenv.mkDerivation (rec {
     ${hadrian}/bin/hadrian ${hadrianArgs}
   '';
   installPhase =
-    if haskell-nix.haskellLib.isCrossTarget
+    if haskell-nix.haskellLib.isCrossTarget || targetPlatform.isMusl
       then ''
         mkdir $out
         cp -r _build/stage1/bin $out

diff --git a/materialized/dummy-ghc/ghc-9.4.2-x86_64-linux/ghc-pkg/dump-global b/materialized/dummy-ghc/ghc-9.4.2-x86_64-linux/ghc-pkg/dump-global
diff --git a/materialized/dummy-ghc/ghc-9.4.2-x86_64-linux/ghc-pkg/version b/materialized/dummy-ghc/ghc-9.4.2-x86_64-linux/ghc-pkg/version
diff --git a/materialized/dummy-ghc/ghc-9.4.2-x86_64-linux/ghc/info b/materialized/dummy-ghc/ghc-9.4.2-x86_64-linux/ghc/info
diff --git a/materialized/dummy-ghc/ghc-9.4.2-x86_64-linux/ghc/numeric-version b/materialized/dummy-ghc/ghc-9.4.2-x86_64-linux/ghc/numeric-version
diff --git a/materialized/dummy-ghc/ghc-9.4.2-x86_64-linux/ghc/supported-languages b/materialized/dummy-ghc/ghc-9.4.2-x86_64-linux/ghc/supported-languages
diff --git a/materialized/dummy-ghc/ghc-9.4.2-x86_64-linux/ghc/version b/materialized/dummy-ghc/ghc-9.4.2-x86_64-linux/ghc/version