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/development/compilers/llvm/8 | |
parent | 99c18b34410fe7bbbe3f6417258b06a3d5e3171d (diff) |
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/development/compilers/llvm/8')
-rw-r--r-- | pkgs/development/compilers/llvm/8/default.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/compilers/llvm/8/default.nix b/pkgs/development/compilers/llvm/8/default.nix index d604dda5fe5e..105011595c8b 100644 --- a/pkgs/development/compilers/llvm/8/default.nix +++ b/pkgs/development/compilers/llvm/8/default.nix @@ -57,8 +57,10 @@ let libstdcxxClang = wrapCCWith rec { cc = tools.clang-unwrapped; - extraPackages = [ + extraTools = [ libstdcxxHook + ]; + extraPackages = [ targetLlvmLibraries.compiler-rt ]; extraBuildCommands = mkExtraBuildCommands cc; |