diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2e94012056e2..aec3beb89b1f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2278,24 +2278,26 @@ let clang = wrapClang clangUnwrapped; libcxxLLVM = callPackage ../development/compilers/llvm { stdenv = libcxxStdenv; }; + clangSelf = clangWrapSelf (callPackage ../development/compilers/llvm/clang.nix { stdenv = libcxxStdenv; llvm = libcxxLLVM; }); clangWrapSelf = build: (import ../build-support/clang-wrapper) { - clang = build; - stdenv = clangStdenv; - libc = glibc; - binutils = binutils; - shell = bash; - inherit libcxx coreutils zlib; - nativeTools = false; - nativeLibc = false; + clang = build; + stdenv = clangStdenv; + libc = glibc; + binutils = binutils; + shell = bash; + inherit libcxx coreutils zlib; + nativeTools = false; + nativeLibc = false; }; #Use this instead of stdenv to build with clang clangStdenv = lowPrio (stdenvAdapters.overrideGCC stdenv clang); + libcxxStdenv = stdenvAdapters.overrideGCC stdenv (clangWrapSelf clangUnwrapped); clean = callPackage ../development/compilers/clean { };