diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-03-18 11:28:52 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-03-18 11:28:52 -0400 |
| commit | bc054004ac04b2500247c2efe504e6b3da444e61 (patch) | |
| tree | 9eafd293d2942509613ea87c2260ea02f8525f01 /pkgs/build-support/cc-wrapper | |
| parent | 99c18b34410fe7bbbe3f6417258b06a3d5e3171d (diff) | |
| download | nixlib-bc054004ac04b2500247c2efe504e6b3da444e61.tar nixlib-bc054004ac04b2500247c2efe504e6b3da444e61.tar.gz nixlib-bc054004ac04b2500247c2efe504e6b3da444e61.tar.bz2 nixlib-bc054004ac04b2500247c2efe504e6b3da444e61.tar.lz nixlib-bc054004ac04b2500247c2efe504e6b3da444e61.tar.xz nixlib-bc054004ac04b2500247c2efe504e6b3da444e61.tar.zst nixlib-bc054004ac04b2500247c2efe504e6b3da444e61.zip | |
cc-wrapper, clang: `libstdcxxHook` should a propagated build input
Lumping it in with the target platform libraries was incorrect, and caused eval failures when gcc couldn't be built for the target platform.
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 b078bf2fbbd3..b7c5ea6e20f2 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 @@ -212,7 +212,7 @@ stdenv.mkDerivation { ''; strictDeps = true; - propagatedBuildInputs = [ bintools ]; + propagatedBuildInputs = [ bintools ] ++ extraTools; depsTargetTargetPropagated = extraPackages; wrapperName = "CC_WRAPPER"; |