JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cc-wrapper, clang: libstdcxxHook should a propagated build input

Browse Source 
Lumping it in with the target platform libraries was incorrect, and
caused eval failures when gcc couldn't be built for the target platform.
This commit is contained in:
John Ericson 2020-03-18 11:28:52 -04:00
parent 99c18b3441
commit bc054004ac
6 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/build-support/cc-wrapper/default.nix
View File

@ -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";

4
pkgs/development/compilers/llvm/5/default.nix
View File

@ -50,8 +50,10 @@ let
libstdcxxClang = wrapCCWith rec {
cc = tools.clang-unwrapped;
extraPackages = [
extraTools = [
libstdcxxHook
];
extraPackages = [
targetLlvmLibraries.compiler-rt
];
extraBuildCommands = mkExtraBuildCommands cc;

4
pkgs/development/compilers/llvm/6/default.nix
View File

@ -50,8 +50,10 @@ let
libstdcxxClang = wrapCCWith rec {
cc = tools.clang-unwrapped;
extraPackages = [
extraTools = [
libstdcxxHook
];
extraPackages = [
targetLlvmLibraries.compiler-rt
];
extraBuildCommands = mkExtraBuildCommands cc;

4
pkgs/development/compilers/llvm/7/default.nix
View File

@ -57,8 +57,10 @@ let
libstdcxxClang = wrapCCWith rec {
cc = tools.clang-unwrapped;
extraPackages = [
extraTools = [
libstdcxxHook
];
extraPackages = [
targetLlvmLibraries.compiler-rt
];
extraBuildCommands = mkExtraBuildCommands cc;

4
pkgs/development/compilers/llvm/8/default.nix
View File

@ -57,8 +57,10 @@ let
libstdcxxClang = wrapCCWith rec {
cc = tools.clang-unwrapped;
extraPackages = [
extraTools = [
libstdcxxHook
];
extraPackages = [
targetLlvmLibraries.compiler-rt
];
extraBuildCommands = mkExtraBuildCommands cc;

4
pkgs/development/compilers/llvm/9/default.nix
View File

@ -57,8 +57,10 @@ let
libstdcxxClang = wrapCCWith rec {
cc = tools.clang-unwrapped;
extraPackages = [
extraTools = [
libstdcxxHook
];
extraPackages = [
targetLlvmLibraries.compiler-rt
];
extraBuildCommands = mkExtraBuildCommands cc;