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

Merge pull request from thefloweringash/ghc-aarch64-llvm 

haskell.compiler.ghc822Binary: propagate llvm dependency
This commit is contained in:
Domen Kožar 2020-03-26 15:18:30 +01:00 committed by GitHub
parent 3e81254cae 31f557c88f
commit 00373dacd3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
pkgs/development/compilers/ghc
8.2.2-binary.nix

5
pkgs/development/compilers/ghc/8.2.2-binary.nix
View File

@ -1,12 +1,15 @@
{ stdenv, substituteAll { stdenv, substituteAll
, fetchurl, perl, gcc, llvm , fetchurl, perl, gcc, llvm
, ncurses5, gmp, glibc, libiconv , ncurses5, gmp, glibc, libiconv
, llvmPackages
}: }:
# Prebuilt only does native # Prebuilt only does native
assert stdenv.targetPlatform == stdenv.hostPlatform; assert stdenv.targetPlatform == stdenv.hostPlatform;
let let
useLLVM = !stdenv.targetPlatform.isx86;
libPath = stdenv.lib.makeLibraryPath ([ libPath = stdenv.lib.makeLibraryPath ([
ncurses5 gmp ncurses5 gmp
] ++ stdenv.lib.optional (stdenv.hostPlatform.isDarwin) libiconv); ] ++ stdenv.lib.optional (stdenv.hostPlatform.isDarwin) libiconv);
@ -53,7 +56,7 @@ stdenv.mkDerivation rec {
or (throw "cannot bootstrap GHC on this platform")); or (throw "cannot bootstrap GHC on this platform"));
nativeBuildInputs = [ perl ]; 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 # Cannot patchelf beforehand due to relative RPATHs that anticipate
# the final install location/ # the final install location/