diff options
| author | John Ericson <git@JohnEricson.me> | 2020-03-19 10:38:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-19 10:38:22 -0400 |
| commit | 19a0b38cbe352f964acafb139e2a37dd082c9e3d (patch) | |
| tree | ee190aa7eae904f4dd763662113c325961c760f0 /pkgs/build-support/cc-wrapper | |
| parent | d96bd3394b734487d1c3bfbac0e8f17465e03afe (diff) | |
| parent | 7c0d3f6f70c7a55e8c988e9d6882820b9d26171d (diff) | |
| download | nixlib-19a0b38cbe352f964acafb139e2a37dd082c9e3d.tar nixlib-19a0b38cbe352f964acafb139e2a37dd082c9e3d.tar.gz nixlib-19a0b38cbe352f964acafb139e2a37dd082c9e3d.tar.bz2 nixlib-19a0b38cbe352f964acafb139e2a37dd082c9e3d.tar.lz nixlib-19a0b38cbe352f964acafb139e2a37dd082c9e3d.tar.xz nixlib-19a0b38cbe352f964acafb139e2a37dd082c9e3d.tar.zst nixlib-19a0b38cbe352f964acafb139e2a37dd082c9e3d.zip | |
Merge pull request #82882 from obsidiansystems/armv6-embedded
Misc fixes for armv6 bare metal cross
Diffstat (limited to 'pkgs/build-support/cc-wrapper')
| -rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 7ae1c87e993a..96d48ecbc79d 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -10,7 +10,7 @@ , cc ? null, libc ? null, bintools, coreutils ? null, shell ? stdenvNoCC.shell , nativeTools, noLibc ? false, nativeLibc, nativePrefix ? "" , propagateDoc ? cc != null && cc ? man -, extraPackages ? [], extraBuildCommands ? "" +, extraTools ? [], extraPackages ? [], extraBuildCommands ? "" , isGNU ? false, isClang ? cc.isClang or false, gnugrep ? null , buildPackages ? {} , libcxx ? null @@ -214,7 +214,7 @@ stdenv.mkDerivation { ''; strictDeps = true; - propagatedBuildInputs = [ bintools ]; + propagatedBuildInputs = [ bintools ] ++ extraTools; depsTargetTargetPropagated = extraPackages; wrapperName = "CC_WRAPPER"; |