diff options
| author | John Ericson <Ericson2314@Yahoo.com> | 2017-05-30 20:17:10 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-06-22 17:53:52 -0400 |
| commit | 12795a706852539b8a29c796caced6295e7af459 (patch) | |
| tree | bbc5d22ec4cf48406442ebabfdd83a6d418d7491 /pkgs/development/compilers/ghc | |
| parent | d016637629e16548a98c9c570136d8ba60e8c9cd (diff) | |
| download | nixlib-12795a706852539b8a29c796caced6295e7af459.tar nixlib-12795a706852539b8a29c796caced6295e7af459.tar.gz nixlib-12795a706852539b8a29c796caced6295e7af459.tar.bz2 nixlib-12795a706852539b8a29c796caced6295e7af459.tar.lz nixlib-12795a706852539b8a29c796caced6295e7af459.tar.xz nixlib-12795a706852539b8a29c796caced6295e7af459.tar.zst nixlib-12795a706852539b8a29c796caced6295e7af459.zip | |
misc: Remove almost all uses of stdenv.{ccCross,binutils}
Diffstat (limited to 'pkgs/development/compilers/ghc')
| -rw-r--r-- | pkgs/development/compilers/ghc/head.nix | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 70200b2fa01b..f199048353c0 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -101,26 +101,26 @@ in stdenv.mkDerivation (rec { ''; configureFlags = [ - "CC=${stdenv.ccCross}/bin/${cross.config}-cc" - "LD=${stdenv.binutils}/bin/${cross.config}-ld" - "AR=${stdenv.binutils}/bin/${cross.config}-ar" - "NM=${stdenv.binutils}/bin/${cross.config}-nm" - "RANLIB=${stdenv.binutils}/bin/${cross.config}-ranlib" + "CC=${stdenv.cc}/bin/${cross.config}-cc" + "LD=${stdenv.cc}/bin/${cross.config}-ld" + "AR=${stdenv.cc}/bin/${cross.config}-ar" + "NM=${stdenv.cc}/bin/${cross.config}-nm" + "RANLIB=${stdenv.cc}/bin/${cross.config}-ranlib" "--target=${cross.config}" "--enable-bootstrap-with-devel-snapshot" ] ++ # fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ lib.optional (cross.config or null == "aarch64-apple-darwin14") "--disable-large-address-space"; - buildInputs = commonBuildInputs ++ [ stdenv.ccCross stdenv.binutils ]; + buildInputs = commonBuildInputs; configurePlatforms = []; passthru = { inherit bootPkgs cross; - cc = "${stdenv.ccCross}/bin/${cross.config}-cc"; + cc = "${stdenv.cc}/bin/${cross.config}-cc"; - ld = "${stdenv.binutils}/bin/${cross.config}-ld"; + ld = "${stdenv.cc}/bin/${cross.config}-ld"; }; }) |