From dd8ad828de283d4bb71fe67689581989549f8421 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sat, 20 Nov 2021 14:28:46 -0800 Subject: [PATCH] llvmPackages_{13,git}.clang: build clang-tools-extra This is already done for previous versions of clang which use a release tarball, but must be done differently for the more recent versions which use fetchFromGitHub. Fixes clang-tools clangd wrapper --- pkgs/development/compilers/llvm/13/clang/default.nix | 2 ++ pkgs/development/compilers/llvm/git/clang/default.nix | 2 ++ 2 files changed, 4 insertions(+) diff --git a/pkgs/development/compilers/llvm/13/clang/default.nix b/pkgs/development/compilers/llvm/13/clang/default.nix index 78c2831a2f35..a775af3031b7 100644 --- a/pkgs/development/compilers/llvm/13/clang/default.nix +++ b/pkgs/development/compilers/llvm/13/clang/default.nix @@ -44,6 +44,8 @@ let ]; postPatch = '' + (cd tools && ln -s ../../clang-tools-extra extra) + sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \ -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' \ lib/Driver/ToolChains/*.cpp diff --git a/pkgs/development/compilers/llvm/git/clang/default.nix b/pkgs/development/compilers/llvm/git/clang/default.nix index 78c2831a2f35..a775af3031b7 100644 --- a/pkgs/development/compilers/llvm/git/clang/default.nix +++ b/pkgs/development/compilers/llvm/git/clang/default.nix @@ -44,6 +44,8 @@ let ]; postPatch = '' + (cd tools && ln -s ../../clang-tools-extra extra) + sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \ -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' \ lib/Driver/ToolChains/*.cpp