public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #92168 from WebGHC/upstream-wasm-cross-nixpkgs-4

Browse Source 
GHC / Haskell packages, wasm cross compilation support
This commit is contained in:
John Ericson 2020-08-16 15:58:56 -04:00 committed by GitHub
commit d4d9ad66a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 37 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/compilers/ghc/8.10.1.nix
View File

@ -55,7 +55,7 @@ let
(targetPlatform != hostPlatform) (targetPlatform != hostPlatform)
"${targetPlatform.config}-"; "${targetPlatform.config}-";
buildMK = '' buildMK = dontStrip: ''
BuildFlavour = ${ghcFlavour} BuildFlavour = ${ghcFlavour}
ifneq \"\$(BuildFlavour)\" \"\" ifneq \"\$(BuildFlavour)\" \"\"
include mk/flavours/\$(BuildFlavour).mk include mk/flavours/\$(BuildFlavour).mk
@ -68,6 +68,8 @@ let
HADDOCK_DOCS = NO HADDOCK_DOCS = NO
BUILD_SPHINX_HTML = NO BUILD_SPHINX_HTML = NO
BUILD_SPHINX_PDF = NO BUILD_SPHINX_PDF = NO
'' + stdenv.lib.optionalString dontStrip ''
STRIP_CMD = :
'' + stdenv.lib.optionalString (!enableProfiledLibs) '' '' + stdenv.lib.optionalString (!enableProfiledLibs) ''
GhcLibWays = "v dyn" GhcLibWays = "v dyn"
'' + stdenv.lib.optionalString enableRelocatedStaticLibs '' '' + stdenv.lib.optionalString enableRelocatedStaticLibs ''
@ -127,7 +129,7 @@ stdenv.mkDerivation (rec {
export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf"
export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip"
echo -n "${buildMK}" > mk/build.mk echo -n "${buildMK dontStrip}" > mk/build.mk
sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
'' + stdenv.lib.optionalString (!stdenv.isDarwin) '' '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
@ -240,8 +242,9 @@ stdenv.mkDerivation (rec {
inherit (ghc.meta) license platforms; inherit (ghc.meta) license platforms;
}; };
} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt { dontStrip = (targetPlatform.useAndroidPrebuilt || targetPlatform.isWasm);
dontStrip = true;
} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt{
dontPatchELF = true; dontPatchELF = true;
noAuditTmpdir = true; noAuditTmpdir = true;
}) })

11
pkgs/development/compilers/ghc/8.8.2.nix
View File

@ -52,7 +52,7 @@ let
(targetPlatform != hostPlatform) (targetPlatform != hostPlatform)
"${targetPlatform.config}-"; "${targetPlatform.config}-";
buildMK = '' buildMK = dontStrip: ''
BuildFlavour = ${ghcFlavour} BuildFlavour = ${ghcFlavour}
ifneq \"\$(BuildFlavour)\" \"\" ifneq \"\$(BuildFlavour)\" \"\"
include mk/flavours/\$(BuildFlavour).mk include mk/flavours/\$(BuildFlavour).mk
@ -65,6 +65,8 @@ let
HADDOCK_DOCS = NO HADDOCK_DOCS = NO
BUILD_SPHINX_HTML = NO BUILD_SPHINX_HTML = NO
BUILD_SPHINX_PDF = NO BUILD_SPHINX_PDF = NO
'' + stdenv.lib.optionalString dontStrip ''
STRIP_CMD = :
'' + stdenv.lib.optionalString enableRelocatedStaticLibs '' '' + stdenv.lib.optionalString enableRelocatedStaticLibs ''
GhcLibHcOpts += -fPIC GhcLibHcOpts += -fPIC
GhcRtsHcOpts += -fPIC GhcRtsHcOpts += -fPIC
@ -122,7 +124,7 @@ stdenv.mkDerivation (rec {
export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf"
export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip"
echo -n "${buildMK}" > mk/build.mk echo -n "${buildMK dontStrip}" > mk/build.mk
sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
'' + stdenv.lib.optionalString (!stdenv.isDarwin) '' '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
@ -235,8 +237,9 @@ stdenv.mkDerivation (rec {
inherit (ghc.meta) license platforms; inherit (ghc.meta) license platforms;
}; };
} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt { dontStrip = (targetPlatform.useAndroidPrebuilt || targetPlatform.isWasm);
dontStrip = true;
} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt{
dontPatchELF = true; dontPatchELF = true;
noAuditTmpdir = true; noAuditTmpdir = true;
}) })

11
pkgs/development/compilers/ghc/8.8.3.nix
View File

@ -55,7 +55,7 @@ let
(targetPlatform != hostPlatform) (targetPlatform != hostPlatform)
"${targetPlatform.config}-"; "${targetPlatform.config}-";
buildMK = '' buildMK = dontStrip: ''
BuildFlavour = ${ghcFlavour} BuildFlavour = ${ghcFlavour}
ifneq \"\$(BuildFlavour)\" \"\" ifneq \"\$(BuildFlavour)\" \"\"
include mk/flavours/\$(BuildFlavour).mk include mk/flavours/\$(BuildFlavour).mk
@ -68,6 +68,8 @@ let
HADDOCK_DOCS = NO HADDOCK_DOCS = NO
BUILD_SPHINX_HTML = NO BUILD_SPHINX_HTML = NO
BUILD_SPHINX_PDF = NO BUILD_SPHINX_PDF = NO
'' + stdenv.lib.optionalString dontStrip ''
STRIP_CMD = :
'' + stdenv.lib.optionalString (!enableProfiledLibs) '' '' + stdenv.lib.optionalString (!enableProfiledLibs) ''
GhcLibWays = "v dyn" GhcLibWays = "v dyn"
'' + stdenv.lib.optionalString enableRelocatedStaticLibs '' '' + stdenv.lib.optionalString enableRelocatedStaticLibs ''
@ -127,7 +129,7 @@ stdenv.mkDerivation (rec {
export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf"
export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip"
echo -n "${buildMK}" > mk/build.mk echo -n "${buildMK dontStrip}" > mk/build.mk
sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
'' + stdenv.lib.optionalString (!stdenv.isDarwin) '' '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
@ -240,8 +242,9 @@ stdenv.mkDerivation (rec {
inherit (ghc.meta) license platforms; inherit (ghc.meta) license platforms;
}; };
} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt { dontStrip = (targetPlatform.useAndroidPrebuilt || targetPlatform.isWasm);
dontStrip = true;
} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt{
dontPatchELF = true; dontPatchELF = true;
noAuditTmpdir = true; noAuditTmpdir = true;
}) })

11
pkgs/development/compilers/ghc/8.8.4.nix
View File

@ -55,7 +55,7 @@ let
(targetPlatform != hostPlatform) (targetPlatform != hostPlatform)
"${targetPlatform.config}-"; "${targetPlatform.config}-";
buildMK = '' buildMK = dontStrip: ''
BuildFlavour = ${ghcFlavour} BuildFlavour = ${ghcFlavour}
ifneq \"\$(BuildFlavour)\" \"\" ifneq \"\$(BuildFlavour)\" \"\"
include mk/flavours/\$(BuildFlavour).mk include mk/flavours/\$(BuildFlavour).mk
@ -68,6 +68,8 @@ let
HADDOCK_DOCS = NO HADDOCK_DOCS = NO
BUILD_SPHINX_HTML = NO BUILD_SPHINX_HTML = NO
BUILD_SPHINX_PDF = NO BUILD_SPHINX_PDF = NO
'' + stdenv.lib.optionalString dontStrip ''
STRIP_CMD = :
'' + stdenv.lib.optionalString (!enableProfiledLibs) '' '' + stdenv.lib.optionalString (!enableProfiledLibs) ''
GhcLibWays = "v dyn" GhcLibWays = "v dyn"
'' + stdenv.lib.optionalString enableRelocatedStaticLibs '' '' + stdenv.lib.optionalString enableRelocatedStaticLibs ''
@ -127,7 +129,7 @@ stdenv.mkDerivation (rec {
export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf"
export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip"
echo -n "${buildMK}" > mk/build.mk echo -n "${buildMK dontStrip}" > mk/build.mk
sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
'' + stdenv.lib.optionalString (!stdenv.isDarwin) '' '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
@ -240,8 +242,9 @@ stdenv.mkDerivation (rec {
inherit (ghc.meta) license platforms; inherit (ghc.meta) license platforms;
}; };
} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt { dontStrip = (targetPlatform.useAndroidPrebuilt || targetPlatform.isWasm);
dontStrip = true;
} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt{
dontPatchELF = true; dontPatchELF = true;
noAuditTmpdir = true; noAuditTmpdir = true;
}) })

11
pkgs/development/compilers/ghc/head.nix
View File

@ -61,7 +61,7 @@ let
(targetPlatform != hostPlatform) (targetPlatform != hostPlatform)
"${targetPlatform.config}-"; "${targetPlatform.config}-";
buildMK = '' buildMK = dontStrip: ''
BuildFlavour = ${ghcFlavour} BuildFlavour = ${ghcFlavour}
ifneq \"\$(BuildFlavour)\" \"\" ifneq \"\$(BuildFlavour)\" \"\"
include mk/flavours/\$(BuildFlavour).mk include mk/flavours/\$(BuildFlavour).mk
@ -74,6 +74,8 @@ let
HADDOCK_DOCS = NO HADDOCK_DOCS = NO
BUILD_SPHINX_HTML = NO BUILD_SPHINX_HTML = NO
BUILD_SPHINX_PDF = NO BUILD_SPHINX_PDF = NO
'' + stdenv.lib.optionalString dontStrip ''
STRIP_CMD = :
'' + stdenv.lib.optionalString (!enableProfiledLibs) '' '' + stdenv.lib.optionalString (!enableProfiledLibs) ''
GhcLibWays = "v dyn" GhcLibWays = "v dyn"
'' + stdenv.lib.optionalString enableRelocatedStaticLibs '' '' + stdenv.lib.optionalString enableRelocatedStaticLibs ''
@ -137,7 +139,7 @@ stdenv.mkDerivation (rec {
export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf"
export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip"
echo -n "${buildMK}" > mk/build.mk echo -n "${buildMK dontStrip}" > mk/build.mk
echo ${version} > VERSION echo ${version} > VERSION
echo ${src.rev} > GIT_COMMIT_ID echo ${src.rev} > GIT_COMMIT_ID
./boot ./boot
@ -256,8 +258,9 @@ stdenv.mkDerivation (rec {
inherit (ghc.meta) license platforms; inherit (ghc.meta) license platforms;
}; };
} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt { dontStrip = (targetPlatform.useAndroidPrebuilt || targetPlatform.isWasm);
dontStrip = true;
} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt{
dontPatchELF = true; dontPatchELF = true;
noAuditTmpdir = true; noAuditTmpdir = true;
}) })

3
pkgs/development/haskell-modules/generic-builder.nix
View File

@ -35,7 +35,7 @@ in
, enableSharedExecutables ? false , enableSharedExecutables ? false
, enableSharedLibraries ? (ghc.enableShared or false) , enableSharedLibraries ? (ghc.enableShared or false)
, enableDeadCodeElimination ? (!stdenv.isDarwin) # TODO: use -dead_strip for darwin , enableDeadCodeElimination ? (!stdenv.isDarwin) # TODO: use -dead_strip for darwin
, enableStaticLibraries ? !stdenv.hostPlatform.isWindows , enableStaticLibraries ? !(stdenv.hostPlatform.isWindows or stdenv.hostPlatform.isWasm)
, enableHsc2hsViaAsm ? stdenv.hostPlatform.isWindows && stdenv.lib.versionAtLeast ghc.version "8.4" , enableHsc2hsViaAsm ? stdenv.hostPlatform.isWindows && stdenv.lib.versionAtLeast ghc.version "8.4"
, extraLibraries ? [], librarySystemDepends ? [], executableSystemDepends ? [] , extraLibraries ? [], librarySystemDepends ? [], executableSystemDepends ? []
# On macOS, statically linking against system frameworks is not supported; # On macOS, statically linking against system frameworks is not supported;
@ -90,6 +90,7 @@ assert editedCabalFile != null -> revision != null;
# --enable-static does not work on windows. This is a bug in GHC. # --enable-static does not work on windows. This is a bug in GHC.
# --enable-static will pass -staticlib to ghc, which only works for mach-o and elf. # --enable-static will pass -staticlib to ghc, which only works for mach-o and elf.
assert stdenv.hostPlatform.isWindows -> enableStaticLibraries == false; assert stdenv.hostPlatform.isWindows -> enableStaticLibraries == false;
assert stdenv.hostPlatform.isWasm -> enableStaticLibraries == false;
let let