diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-20 01:39:59 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-20 01:39:59 -0400 |
commit | e9c1f640482f7028dfd192b6e8b3bf39eed7333b (patch) | |
tree | e4b8268a4582170ddda11be24edd4e7e76a9ad48 /pkgs/build-support | |
parent | d6191bd6c28a4417f9ee4006c31412f30929cd7c (diff) | |
parent | 19e3c580ad60319596cab44e1ed75640b69c09d4 (diff) | |
download | nixpkgs-e9c1f640482f7028dfd192b6e8b3bf39eed7333b.tar nixpkgs-e9c1f640482f7028dfd192b6e8b3bf39eed7333b.tar.gz nixpkgs-e9c1f640482f7028dfd192b6e8b3bf39eed7333b.tar.bz2 nixpkgs-e9c1f640482f7028dfd192b6e8b3bf39eed7333b.tar.lz nixpkgs-e9c1f640482f7028dfd192b6e8b3bf39eed7333b.tar.xz nixpkgs-e9c1f640482f7028dfd192b6e8b3bf39eed7333b.tar.zst nixpkgs-e9c1f640482f7028dfd192b6e8b3bf39eed7333b.zip |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/build-support')
-rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 7 | ||||
-rw-r--r-- | pkgs/build-support/gcc-wrapper-old/default.nix | 10 |
2 files changed, 4 insertions, 13 deletions
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 999faf756ed..866be9cded9 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -86,7 +86,8 @@ stdenv.mkDerivation { preferLocalBuild = true; - inherit cc shell libc_bin libc_dev libc_lib binutils_bin coreutils_bin; + inherit cc libc_bin libc_dev libc_lib binutils_bin coreutils_bin; + shell = getBin shell + shell.shellPath or ""; gnugrep_bin = if nativeTools then "" else gnugrep; binPrefix = prefix; @@ -384,10 +385,6 @@ stdenv.mkDerivation { # for substitution in utils.sh expandResponseParams = "${expand-response-params}/bin/expand-response-params"; - crossAttrs = { - shell = shell.crossDrv + shell.crossDrv.shellPath; - }; - meta = let cc_ = if cc != null then cc else {}; in (if cc_ ? meta then removeAttrs cc.meta ["priority"] else {}) // diff --git a/pkgs/build-support/gcc-wrapper-old/default.nix b/pkgs/build-support/gcc-wrapper-old/default.nix index 8d28879fb06..ae17989d932 100644 --- a/pkgs/build-support/gcc-wrapper-old/default.nix +++ b/pkgs/build-support/gcc-wrapper-old/default.nix @@ -6,7 +6,7 @@ # variables so that the compiler and the linker just "work". { name ? "", stdenv, lib, nativeTools, nativeLibc, nativePrefix ? "" -, gcc ? null, libc ? null, binutils ? null, coreutils ? null, shell ? "" +, gcc ? null, libc ? null, binutils ? null, coreutils ? null, shell ? stdenv.shell , zlib ? null , hostPlatform, targetPlatform }: @@ -56,15 +56,9 @@ stdenv.mkDerivation { langAda = if nativeTools then false else gcc ? langAda && gcc.langAda; langVhdl = if nativeTools then false else gcc ? langVhdl && gcc.langVhdl; zlib = if gcc != null && gcc ? langVhdl then zlib else null; - shell = if shell == "" then stdenv.shell else - if builtins.isAttrs shell then (shell + shell.shellPath) - else shell; + shell = shell + shell.shellPath or ""; crossAttrs = { - shell = shell.crossDrv + shell.crossDrv.shellPath; - coreutils = coreutils.crossDrv; - binutils = binutils.crossDrv; - gcc = gcc.crossDrv; # # This is not the best way to do this. I think the reference should be # the style in the gcc-cross-wrapper, but to keep a stable stdenv now I |