ilyakooo0/haskell.nix
1
0
Fork 0
mirror of https://github.com/ilyakooo0/haskell.nix.git synced 2024-08-15 18:00:50 +03:00
Code Issues Projects Releases Wiki Activity

Support native bignum (including static builds) (#1569)

Browse Source 
Co-authored-by: Mikaela Allan <mikaela@vitalbio.com>
Co-authored-by: Travis Whitaker <pi.boy.travis@gmail.com>
This commit is contained in:
Hamish Mackenzie 2022-08-02 17:42:17 +12:00 committed by GitHub
parent 2f49f0a0c6
commit 1ccfd295aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
compiler/ghc/default.nix
View File

@ -31,6 +31,9 @@ let self =
, # If enabled, GHC will be built with the GPL-free but slower integer-simple
# library instead of the faster but GPLed integer-gmp library.
enableIntegerSimple ? !(lib.any (lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp
, # If enabled, GHC will be built with the GPL-free native backend of the
# bignum library that is nearly as fast as GMP
enableNativeBignum ? !((lib.any (lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms) || enableIntegerSimple)
, # If enabled, use -fPIC when compiling static libs.
enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform && !stdenv.targetPlatform.isAarch32
@ -71,7 +74,11 @@ let self =
, extra-passthru ? {}
}@args:
assert !enableIntegerSimple -> gmp != null;
assert !(enableIntegerSimple || enableNativeBignum) -> gmp != null;
# Early check to make sure only one of these is enabled
assert enableNativeBignum -> !enableIntegerSimple;
assert enableIntegerSimple -> !enableNativeBignum;
let
inherit (stdenv) buildPlatform hostPlatform targetPlatform;
@ -79,6 +86,17 @@ let
inherit (bootPkgs) ghc;
ghcHasNativeBignum = builtins.compareVersions ghc-version "9.0" >= 0;
bignumSpec =
assert ghcHasNativeBignum -> !enableIntegerSimple;
assert !ghcHasNativeBignum -> !enableNativeBignum;
if ghcHasNativeBignum then ''
BIGNUM_BACKEND = ${if enableNativeBignum then "native" else "gmp"}
'' else ''
INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"}
'';
# TODO check if this possible fix for segfaults works or not.
targetLibffi =
# on native platforms targetPlatform.{libffi, gmp} do not exist; thus fall back
@ -106,7 +124,7 @@ let
include mk/flavours/\$(BuildFlavour).mk
endif
DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"}
'' + bignumSpec + ''
EXTRA_HADDOCK_OPTS += --quickjump --hyperlinked-source
'' + lib.optionalString (targetPlatform != hostPlatform) ''
CrossCompilePrefix = ${targetPrefix}
@ -121,6 +139,10 @@ let
'' + lib.optionalString enableRelocatedStaticLibs ''
GhcLibHcOpts += -fPIC
GhcRtsHcOpts += -fPIC
GhcRtsCcOpts += -fPIC
'' + lib.optionalString (enableRelocatedStaticLibs && targetPlatform.isx86_64 && !targetPlatform.isWindows) ''
GhcLibHcOpts += -fexternal-dynamic-refs
GhcRtsHcOpts += -fexternal-dynamic-refs
'' + lib.optionalString enableDWARF ''
GhcLibHcOpts += -g3
GhcRtsHcOpts += -g3

20
overlays/ghc.nix
View File

@ -1,9 +1,13 @@
final: prev: with prev;
# sadly we need to patch GHC a bit.
let
ghcPkgOverrides = {
enableIntegerSimple = false;
};
let
# The new implementation appeared in GHC 9.0
hasNativeBignum = name: !lib.hasPrefix "ghc8" name;
ghcPkgOverrides = name: { enableIntegerSimple = false; } // lib.optionalAttrs (hasNativeBignum name) {
enableNativeBignum = false;
};
ghcDrvOverrides = drv: {
hardeningDisable = (drv.hardeningDisable or []) ++ [ "stackprotector" "format" ] ++ lib.optionals prev.stdenv.hostPlatform.isAarch32 [ "pic" "pie" ];
};
@ -20,13 +24,13 @@ final: prev: with prev;
&& !lib.hasPrefix "ghc82" name
&& !lib.hasPrefix "ghcjs" name
&& !lib.hasSuffix "Binary" name;
overrideCompiler = compiler:
((compiler.override ghcPkgOverrides).overrideAttrs ghcDrvOverrides) // {
dwarf = overrideCompiler compiler.dwarf;
overrideCompiler = name: compiler:
((compiler.override (ghcPkgOverrides name)).overrideAttrs ghcDrvOverrides) // {
dwarf = overrideCompiler name compiler.dwarf;
};
in
lib.recursiveUpdate prev.haskell-nix {
compiler = lib.mapAttrs (_name: overrideCompiler)
compiler = lib.mapAttrs overrideCompiler
(lib.filterAttrs (name: _value: needsPatches name) prev.haskell-nix.compiler);
};
}