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

Merge pull request #123377 from sternenseemann/fix-ghc-head

Browse Source 
haskell.compiler.ghcHEAD: disable DWARF on non x86
This commit is contained in:
Dennis Gosnell 2021-05-18 09:51:16 +09:00 committed by GitHub
commit c5cd6a2fb9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,7 +10,9 @@
, # GHC can be built with system libffi or a bundled one. , # GHC can be built with system libffi or a bundled one.
libffi ? null libffi ? null
, enableDwarf ? !stdenv.targetPlatform.isDarwin && # Libdw.c only supports x86_64, i686 and s390x
, enableDwarf ? stdenv.targetPlatform.isx86 &&
!stdenv.targetPlatform.isDarwin &&
!stdenv.targetPlatform.isWindows !stdenv.targetPlatform.isWindows
, elfutils # for DWARF support , elfutils # for DWARF support
@ -258,10 +260,7 @@ stdenv.mkDerivation (rec {
homepage = "http://haskell.org/ghc"; homepage = "http://haskell.org/ghc";
description = "The Glasgow Haskell Compiler"; description = "The Glasgow Haskell Compiler";
maintainers = with lib.maintainers; [ marcweber andres peti ]; maintainers = with lib.maintainers; [ marcweber andres peti ];
inherit (ghc.meta) license; inherit (ghc.meta) license platforms;
# GHC-HEAD does not appear to compile on aarch64.
broken = stdenv.isAarch64;
platforms = builtins.filter (p: p != "aarch64-linux") ghc.meta.platforms;
}; };
dontStrip = (targetPlatform.useAndroidPrebuilt || targetPlatform.isWasm); dontStrip = (targetPlatform.useAndroidPrebuilt || targetPlatform.isWasm);

2
pkgs/top-level/haskell-packages.nix
View File

@ -86,7 +86,7 @@ in {
llvmPackages = pkgs.llvmPackages_10; llvmPackages = pkgs.llvmPackages_10;
}; };
ghcHEAD = callPackage ../development/compilers/ghc/head.nix { ghcHEAD = callPackage ../development/compilers/ghc/head.nix {
bootPkgs = packages.ghc8104; # no binary yet bootPkgs = packages.ghc901; # no binary yet
inherit (buildPackages.python3Packages) sphinx; inherit (buildPackages.python3Packages) sphinx;
buildLlvmPackages = buildPackages.llvmPackages_10; buildLlvmPackages = buildPackages.llvmPackages_10;
llvmPackages = pkgs.llvmPackages_10; llvmPackages = pkgs.llvmPackages_10;