From 64ec4dd87bf7b211773541fa350ef2f56b9c658f Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 18 Nov 2016 10:44:53 -0500 Subject: Add haskell packages set for cross ghc --- pkgs/development/compilers/ghc/head.nix | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) (limited to 'pkgs/development/compilers/ghc') diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index d95791353ae3..f46a017c66aa 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, bootPkgs, perl, gmp, ncurses, libiconv, binutils, coreutils -, autoconf, automake, happy, alex, cross ? null +, autoconf, automake, happy, alex, crossSystem, selfPkgs, cross ? null }: let @@ -70,6 +70,11 @@ in stdenv.mkDerivation (rec { passthru = { inherit bootPkgs; + } // stdenv.lib.optionalAttrs (crossSystem != null) { + crossCompiler = selfPkgs.ghc.override { + cross = crossSystem; + bootPkgs = selfPkgs; + }; }; meta = { @@ -90,11 +95,24 @@ in stdenv.mkDerivation (rec { ''; configureFlags = [ - "CC=${cross.config}-cc" + "CC=${stdenv.ccCross}/bin/${cross.config}-cc" + "LD=${stdenv.binutilsCross}/bin/${cross.config}-ld" + "AR=${stdenv.binutilsCross}/bin/${cross.config}-ar" + "NM=${stdenv.binutilsCross}/bin/${cross.config}-nm" + "RANLIB=${stdenv.binutilsCross}/bin/${cross.config}-ranlib" "--target=${cross.config}" + "--enable-bootstrap-with-devel-snapshot" ]; buildInputs = commonBuildInputs ++ [ stdenv.ccCross stdenv.binutilsCross ]; dontSetConfigureCross = true; + + passthru = { + inherit bootPkgs cross; + + cc = "${stdenv.ccCross}/bin/${cross.config}-cc"; + + ld = "${stdenv.binutilsCross}/bin/${cross.config}-ld"; + }; }) -- cgit 1.4.1