Skip to content

Commit

Permalink
Merge pull request #80355 from thefloweringash/ghc-aarch64-llvm
Browse files Browse the repository at this point in the history
haskell.compiler.ghc822Binary: propagate llvm dependency
  • Loading branch information
domenkozar authored Mar 26, 2020
2 parents 3e81254 + 31f557c commit 00373da
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion pkgs/development/compilers/ghc/8.2.2-binary.nix
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
{ stdenv, substituteAll
, fetchurl, perl, gcc, llvm
, ncurses5, gmp, glibc, libiconv
, llvmPackages
}:

# Prebuilt only does native
assert stdenv.targetPlatform == stdenv.hostPlatform;

let
useLLVM = !stdenv.targetPlatform.isx86;

libPath = stdenv.lib.makeLibraryPath ([
ncurses5 gmp
] ++ stdenv.lib.optional (stdenv.hostPlatform.isDarwin) libiconv);
Expand Down Expand Up @@ -53,7 +56,7 @@ stdenv.mkDerivation rec {
or (throw "cannot bootstrap GHC on this platform"));

nativeBuildInputs = [ perl ];
buildInputs = stdenv.lib.optionals (stdenv.targetPlatform.isAarch32 || stdenv.targetPlatform.isAarch64) [ llvm ];
propagatedBuildInputs = stdenv.lib.optionals useLLVM [ llvmPackages.llvm ];

# Cannot patchelf beforehand due to relative RPATHs that anticipate
# the final install location/
Expand Down

0 comments on commit 00373da

Please sign in to comment.