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

ghc: ARM builds have an LLVM runtime dependency.

Browse Source
This commit is contained in:
Drew Hess 2018-01-03 15:57:23 -08:00
parent 75634afba8
commit 461139e3fa
No known key found for this signature in database
GPG Key ID: DEDAB57E001BD839
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/compilers/ghc/7.10.3-binary.nix
View File

@ -1,7 +1,7 @@
{ stdenv { stdenv
, fetchurl, perl , fetchurl, perl
, ncurses5, gmp, libiconv , ncurses5, gmp, libiconv
, gcc , gcc, llvm_35
}: }:
# Prebuilt only does native # Prebuilt only does native
@ -43,6 +43,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.isArm [ llvm_35 ];
# 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/

4
pkgs/development/compilers/ghc/7.10.3.nix
View File

@ -2,7 +2,7 @@
, buildPlatform, hostPlatform, targetPlatform , buildPlatform, hostPlatform, targetPlatform
# build-tools # build-tools
, bootPkgs, hscolour , bootPkgs, hscolour, llvm_35
, coreutils, fetchurl, fetchpatch, perl , coreutils, fetchurl, fetchpatch, perl
, docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42, libxml2, libxslt , docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42, libxml2, libxslt
@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
./relocation.patch ./relocation.patch
]; ];
buildInputs = [ ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 hscolour ]; buildInputs = [ ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 hscolour ] ++ stdenv.lib.optionals stdenv.isArm [ llvm_35 ];
enableParallelBuilding = true; enableParallelBuilding = true;

4
pkgs/development/compilers/ghc/8.0.2.nix
View File

@ -2,7 +2,7 @@
, buildPlatform, hostPlatform, targetPlatform , buildPlatform, hostPlatform, targetPlatform
# build-tools # build-tools
, bootPkgs, hscolour , bootPkgs, hscolour, llvm_37
, coreutils, fetchurl, fetchpatch, patchutils, perl, sphinx , coreutils, fetchurl, fetchpatch, patchutils, perl, sphinx
, libiconv ? null, ncurses , libiconv ? null, ncurses
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch
++ stdenv.lib.optional stdenv.isDarwin ./ghc-8.0.2-no-cpp-warnings.patch; ++ stdenv.lib.optional stdenv.isDarwin ./ghc-8.0.2-no-cpp-warnings.patch;
buildInputs = [ ghc perl hscolour sphinx ]; buildInputs = [ ghc perl hscolour sphinx ] ++ stdenv.lib.optionals (stdenv.isArm || stdenv.isAarch64) [ llvm_37 ];
enableParallelBuilding = true; enableParallelBuilding = true;

3
pkgs/development/compilers/ghc/8.2.1-binary.nix
View File

@ -1,5 +1,5 @@
{ stdenv { stdenv
, fetchurl, perl, gcc , fetchurl, perl, gcc, llvm_39
, ncurses5, gmp, libiconv , ncurses5, gmp, libiconv
}: }:
@ -46,6 +46,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.isArm || stdenv.isAarch64) [ llvm_39 ];
# 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/

4
pkgs/development/compilers/ghc/8.2.2.nix
View File

@ -3,7 +3,7 @@
, selfPkgs, cross ? null , selfPkgs, cross ? null
# build-tools # build-tools
, bootPkgs, alex, happy, hscolour , bootPkgs, alex, happy, hscolour, llvm_39
, autoconf, automake, coreutils, fetchurl, perl, python3, sphinx , autoconf, automake, coreutils, fetchurl, perl, python3, sphinx
, libiconv ? null, ncurses , libiconv ? null, ncurses
@ -46,7 +46,7 @@ stdenv.mkDerivation (rec {
sed 's|#BuildFlavour = quick-cross|BuildFlavour = perf-cross|' mk/build.mk.sample > mk/build.mk sed 's|#BuildFlavour = quick-cross|BuildFlavour = perf-cross|' mk/build.mk.sample > mk/build.mk
''; '';
buildInputs = [ alex autoconf automake ghc happy hscolour perl python3 sphinx ]; buildInputs = [ alex autoconf automake ghc happy hscolour perl python3 sphinx ] ++ stdenv.lib.optionals (stdenv.isArm || stdenv.isAarch64) [ llvm_39 ];
enableParallelBuilding = true; enableParallelBuilding = true;