diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-08-26 11:43:30 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-12-13 16:08:18 -0500 |
| commit | 2bba92906231ae021b4778986419320c3792ce48 (patch) | |
| tree | eb6f8526328212ec104c8851a18d93b804722099 /pkgs/build-support/cc-wrapper/default.nix | |
| parent | 8e557ed2c58e6ce48a8d05dbc57ef84e98b4cecd (diff) | |
| download | nixpkgs-2bba92906231ae021b4778986419320c3792ce48.tar nixpkgs-2bba92906231ae021b4778986419320c3792ce48.tar.gz nixpkgs-2bba92906231ae021b4778986419320c3792ce48.tar.bz2 nixpkgs-2bba92906231ae021b4778986419320c3792ce48.tar.lz nixpkgs-2bba92906231ae021b4778986419320c3792ce48.tar.xz nixpkgs-2bba92906231ae021b4778986419320c3792ce48.tar.zst nixpkgs-2bba92906231ae021b4778986419320c3792ce48.zip | |
bintools-wrapper: Import separately from cc-wrapper
Diffstat (limited to 'pkgs/build-support/cc-wrapper/default.nix')
| -rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index f554a2425dd..ae4bdfd575b 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -6,18 +6,17 @@ # compiler and the linker just "work". { name ? "", stdenvNoCC, nativeTools, noLibc ? false, nativeLibc, nativePrefix ? "" -, cc ? null, libc ? null, binutils ? null, coreutils ? null, shell ? stdenvNoCC.shell +, cc ? null, libc ? null, bintools, coreutils ? null, shell ? stdenvNoCC.shell , zlib ? null, extraPackages ? [], extraBuildCommands ? "" , isGNU ? false, isClang ? cc.isClang or false, gnugrep ? null , buildPackages ? {} -, useMacosReexportHack ? false }: with stdenvNoCC.lib; assert nativeTools -> nativePrefix != ""; assert !nativeTools -> - cc != null && binutils != null && coreutils != null && gnugrep != null; + cc != null && coreutils != null && gnugrep != null; assert !(nativeLibc && noLibc); assert (noLibc || nativeLibc) == (libc == null); @@ -28,17 +27,6 @@ let stdenv = stdenvNoCC; inherit (stdenv) hostPlatform targetPlatform; - bintools = import ../bintools-wrapper { - bintools = binutils; - inherit # name - stdenvNoCC nativeTools noLibc nativeLibc nativePrefix - libc - coreutils shell gnugrep - extraPackages extraBuildCommands - buildPackages - useMacosReexportHack; - }; - # Prefix for binaries. Customarily ends with a dash separator. # # TODO(@Ericson2314) Make unconditional, or optional but always true by |