Use emscripten

input-output-hk · Mar 16, 2023 · 4c19771 · 4c19771
1 parent 054e5bb
commit 4c19771
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/compiler/ghc/default.nix b/compiler/ghc/default.nix
@@ -198,7 +198,7 @@ let
         "--enable-dwarf-unwind"
         "--with-libdw-includes=${lib.getDev elfutils}/include"
         "--with-libdw-libraries=${lib.getLib elfutils}/lib"
-    ];
+    ] ++ lib.optional (targetPlatform.isGhcjs) "--target=javascript-unknown-ghcjs"; # TODO use 
 
   # Splicer will pull out correct variations
   libDeps = platform: lib.optional (enableTerminfo && !targetPlatform.isGhcjs) [ targetPackages.ncurses targetPackages.ncurses.dev ]
@@ -292,23 +292,27 @@ stdenv.mkDerivation (rec {
         for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do
         export "''${env#TARGET_}=''${!env}"
         done
+    '' + lib.optionalString (targetPlatform.isGhcjs) ''
+        export CC="${targetCC}/bin/emcc"
+        export CXX="${targetCC}/bin/em++"
+        export LD="${targetCC}/bin/emcc"
     ''
     # GHC is a bit confused on its cross terminology, as these would normally be
     # the *host* tools.
-    + ''
+    + lib.optionalString (!targetPlatform.isGhcjs) (''
         export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
         export CXX="${targetCC}/bin/${targetCC.targetPrefix}c++"
     ''
     # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
-    + lib.optionalString (!targetPlatform.isGhcjs) ''
+    + ''
         export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}"
         export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
         export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
         export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
         export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib"
         export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf"
         export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip"
-    '' + lib.optionalString (targetPlatform == hostPlatform && useLdGold) 
+    '') + lib.optionalString (targetPlatform == hostPlatform && useLdGold) 
     # set LD explicitly if we want gold even if we aren't cross compiling
     ''
         export LD="${targetCC.bintools}/bin/ld.gold"
@@ -355,7 +359,7 @@ stdenv.mkDerivation (rec {
         ./boot
     '';
 
-  configurePlatforms = [ "build" "host" "target" ];
+  configurePlatforms = [ "build" "host" ] ++ lib.optional (!targetPlatform.isGhcjs) "target";
 
   enableParallelBuilding = true;
   postPatch = "patchShebangs .";