diff options
author | Peter Simons <simons@cryp.to> | 2018-01-08 11:50:41 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-08 11:50:41 +0100 |
commit | 48a6d1a2ab3309081ccbf933ccf071068a5c2c48 (patch) | |
tree | b61f002eadd994beda47c7fdfec613f8afdb87fd /pkgs/development/compilers | |
parent | 424aa1a6814017eaa4dcafc97a42af6a476582c8 (diff) | |
parent | 05824e66a1425c07c0249846756b1109b9953927 (diff) | |
download | nixlib-48a6d1a2ab3309081ccbf933ccf071068a5c2c48.tar nixlib-48a6d1a2ab3309081ccbf933ccf071068a5c2c48.tar.gz nixlib-48a6d1a2ab3309081ccbf933ccf071068a5c2c48.tar.bz2 nixlib-48a6d1a2ab3309081ccbf933ccf071068a5c2c48.tar.lz nixlib-48a6d1a2ab3309081ccbf933ccf071068a5c2c48.tar.xz nixlib-48a6d1a2ab3309081ccbf933ccf071068a5c2c48.tar.zst nixlib-48a6d1a2ab3309081ccbf933ccf071068a5c2c48.zip |
Merge pull request #33405 from dhess/ghc-armv7l
Make GHC work on armv7l-linux
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r-- | pkgs/development/compilers/ghc/7.10.3-binary.nix | 3 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/7.10.3.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/8.0.2.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/8.2.1-binary.nix | 3 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/8.2.2.nix | 6 |
5 files changed, 12 insertions, 8 deletions
diff --git a/pkgs/development/compilers/ghc/7.10.3-binary.nix b/pkgs/development/compilers/ghc/7.10.3-binary.nix index 6fed39317c75..b68c84711b0d 100644 --- a/pkgs/development/compilers/ghc/7.10.3-binary.nix +++ b/pkgs/development/compilers/ghc/7.10.3-binary.nix @@ -1,7 +1,7 @@ { stdenv , fetchurl, perl , ncurses5, gmp, libiconv -, gcc +, gcc, llvm_35 }: # Prebuilt only does native @@ -43,6 +43,7 @@ stdenv.mkDerivation rec { or (throw "cannot bootstrap GHC on this platform")); nativeBuildInputs = [ perl ]; + buildInputs = stdenv.lib.optionals stdenv.isArm [ llvm_35 ]; # Cannot patchelf beforehand due to relative RPATHs that anticipate # the final install location/ diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix index 1d9e2814a1f6..dd5acfa16f1f 100644 --- a/pkgs/development/compilers/ghc/7.10.3.nix +++ b/pkgs/development/compilers/ghc/7.10.3.nix @@ -2,7 +2,7 @@ , buildPlatform, hostPlatform, targetPlatform # build-tools -, bootPkgs, hscolour +, bootPkgs, hscolour, llvm_35 , coreutils, fetchurl, fetchpatch, perl , docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42, libxml2, libxslt @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ./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; diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix index 762fe547ca9c..bb706aa6bbc3 100644 --- a/pkgs/development/compilers/ghc/8.0.2.nix +++ b/pkgs/development/compilers/ghc/8.0.2.nix @@ -2,7 +2,7 @@ , buildPlatform, hostPlatform, targetPlatform # build-tools -, bootPkgs, hscolour +, bootPkgs, hscolour, llvm_37 , coreutils, fetchurl, fetchpatch, patchutils, perl, sphinx , libiconv ? null, ncurses @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.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; diff --git a/pkgs/development/compilers/ghc/8.2.1-binary.nix b/pkgs/development/compilers/ghc/8.2.1-binary.nix index b3b5e2eceec0..ec2694a00286 100644 --- a/pkgs/development/compilers/ghc/8.2.1-binary.nix +++ b/pkgs/development/compilers/ghc/8.2.1-binary.nix @@ -1,5 +1,5 @@ { stdenv -, fetchurl, perl, gcc +, fetchurl, perl, gcc, llvm_39 , ncurses5, gmp, libiconv }: @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { or (throw "cannot bootstrap GHC on this platform")); nativeBuildInputs = [ perl ]; + buildInputs = stdenv.lib.optionals (stdenv.isArm || stdenv.isAarch64) [ llvm_39 ]; # Cannot patchelf beforehand due to relative RPATHs that anticipate # the final install location/ diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index bffc7c3fc6c7..5ef71804b570 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -3,7 +3,7 @@ , selfPkgs, cross ? null # build-tools -, bootPkgs, alex, happy, hscolour +, bootPkgs, alex, happy, hscolour, llvm_39 , autoconf, automake, coreutils, fetchurl, perl, python3, sphinx , 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 ''; - 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; @@ -58,6 +58,8 @@ stdenv.mkDerivation (rec { "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" ] ++ stdenv.lib.optional stdenv.isDarwin [ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" + ] ++ stdenv.lib.optional stdenv.isArm [ + "LD=${stdenv.cc}/bin/ld.gold" ]; # required, because otherwise all symbols from HSffi.o are stripped, and |