Skip to content

Commit 801a9a9

Browse files
committed
llvmPackages.libcxx: Include libc sources in input
Without this, after llvm 6c4267fb1779bc5550bb413f33250f9365acfbc6 you get a build failure because libcxx can't find headers which now live in the libc tree. Ref: https://discourse.llvm.org/t/rfc-project-hand-in-hand-llvm-libc-libc-code-sharing/77701/18 Ref: llvm/llvm-project@6c4267f Signed-off-by: Peter Waller <[email protected]>
1 parent 6011527 commit 801a9a9

File tree

1 file changed

+2
-0
lines changed
  • pkgs/development/compilers/llvm/common/libcxx

1 file changed

+2
-0
lines changed

pkgs/development/compilers/llvm/common/libcxx/default.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ let
4444
cp -r ${monorepoSrc}/llvm/utils "$out/llvm"
4545
'' + (lib.optionalString (lib.versionAtLeast release_version "14") ''
4646
cp -r ${monorepoSrc}/third-party "$out"
47+
'') + (lib.optionalString (lib.versionAtLeast release_version "20") ''
48+
cp -r ${monorepoSrc}/libc "$out"
4749
'') + ''
4850
cp -r ${monorepoSrc}/runtimes "$out"
4951
'' + (lib.optionalString (cxxabi == null) ''

0 commit comments

Comments
 (0)