llvmPackages_git: switch to using ninja

pkgs/development/compilers/llvm/git/clang/default.nix

@@ -1,6 +1,6 @@
 { lib, stdenv, llvm_meta
 , monorepoSrc, runCommand
-, substituteAll, cmake, libxml2, libllvm, version, python3
+, substituteAll, cmake, ninja, libxml2, libllvm, version, python3
 , buildLlvmTools
 , fixDarwinDylibNames
 , enableManpages ? false
@@ -20,7 +20,7 @@ let
 
     sourceRoot = "${src.name}/${pname}";
 
-    nativeBuildInputs = [ cmake python3 ]
+    nativeBuildInputs = [ cmake ninja python3 ]
       ++ lib.optional enableManpages python3.pkgs.sphinx
       ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
@@ -112,9 +112,7 @@ let
   } // lib.optionalAttrs enableManpages {
     pname = "clang-manpages";
 
-    buildPhase = ''
-      make docs-clang-man
-    '';
+    ninjaFlags = [ "docs-clang-man" ];
 
     installPhase = ''
       mkdir -p $out/share/man/man1

pkgs/development/compilers/llvm/git/compiler-rt/default.nix

@@ -1,6 +1,6 @@
 { lib, stdenv, llvm_meta, version
 , monorepoSrc, runCommand
-, cmake, python3, xcbuild, libllvm, libcxxabi, libxcrypt
+, cmake, ninja, python3, xcbuild, libllvm, libcxxabi, libxcrypt
 , doFakeLibgcc ? stdenv.hostPlatform.isFreeBSD
 }:
 
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
   inherit src;
   sourceRoot = "${src.name}/${baseName}";
 
-  nativeBuildInputs = [ cmake python3 libllvm.dev ]
+  nativeBuildInputs = [ cmake ninja python3 libllvm.dev ]
     ++ lib.optional stdenv.isDarwin xcbuild.xcrun;
   buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
 

pkgs/development/compilers/llvm/git/default.nix

@@ -1,4 +1,4 @@
-{ lowPrio, newScope, pkgs, lib, stdenv, cmake
+{ lowPrio, newScope, pkgs, lib, stdenv, cmake, ninja
 , gccForLibs, preLibcCrossHeaders
 , libxml2, python3, isl, fetchFromGitHub, overrideCC, wrapCCWith, wrapBintoolsWith
 , buildLlvmTools # tools, but from the previous stage, for cross
@@ -40,7 +40,7 @@ let
   };
 
   tools = lib.makeExtensible (tools: let
-    callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version monorepoSrc buildLlvmTools; });
+    callPackage = newScope (tools // { inherit stdenv cmake ninja libxml2 python3 isl release_version version monorepoSrc buildLlvmTools; });
     mkExtraBuildCommands0 = cc: ''
       rsrc="$out/resource-root"
       mkdir "$rsrc"
@@ -220,7 +220,7 @@ let
   });
 
   libraries = lib.makeExtensible (libraries: let
-    callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version monorepoSrc; });
+    callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake ninja libxml2 python3 isl release_version version monorepoSrc; });
   in {
 
     compiler-rt-libc = callPackage ./compiler-rt {

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

@@ -1,6 +1,6 @@
 { lib, stdenv, llvm_meta
 , monorepoSrc, runCommand
-, cmake, python3, fixDarwinDylibNames, version
+, cmake, ninja, python3, fixDarwinDylibNames, version
 , cxxabi ? if stdenv.hostPlatform.isFreeBSD then libcxxrt else libcxxabi
 , libcxxabi, libcxxrt
 , enableShared ? !stdenv.hostPlatform.isStatic
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
     patchShebangs utils/cat_files.py
   '';
 
-  nativeBuildInputs = [ cmake python3 ]
+  nativeBuildInputs = [ cmake ninja python3 ]
     ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
   buildInputs = lib.optionals (!headersOnly) [ cxxabi ];
@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
       "-DLIBCXX_ENABLE_EXCEPTIONS=OFF"
     ] ++ lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF";
 
-  buildFlags = lib.optional headersOnly "generate-cxx-headers";
+  ninjaFlags = lib.optional headersOnly "generate-cxx-headers";
   installTargets = lib.optional headersOnly "install-cxx-headers";
 
   preInstall = lib.optionalString (stdenv.isDarwin && !headersOnly) ''

pkgs/development/compilers/llvm/git/libcxxabi/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, llvm_meta, cmake, python3
+{ lib, stdenv, llvm_meta, cmake, ninja, python3
 , monorepoSrc, runCommand, fetchpatch
 , cxx-headers, libunwind, version
 , enableShared ? !stdenv.hostPlatform.isStatic
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
     cd ../runtimes
   '';
 
-  nativeBuildInputs = [ cmake python3 ];
+  nativeBuildInputs = [ cmake ninja python3 ];
   buildInputs = lib.optional (!stdenv.isDarwin && !stdenv.hostPlatform.isWasm) libunwind;
 
   cmakeFlags = [

pkgs/development/compilers/llvm/git/libunwind/default.nix

@@ -1,6 +1,7 @@
 { lib, stdenv, llvm_meta, version
 , monorepoSrc, runCommand
 , cmake
+, ninja
 , python3
 , enableShared ? !stdenv.hostPlatform.isStatic
 }:
@@ -41,7 +42,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ cmake python3 ];
+  nativeBuildInputs = [ cmake ninja python3 ];
 
   cmakeFlags = [
     "-DLLVM_ENABLE_RUNTIMES=libunwind"

pkgs/development/compilers/llvm/git/lld/default.nix

@@ -2,6 +2,7 @@
 , buildLlvmTools
 , monorepoSrc, runCommand
 , cmake
+, ninja
 , libxml2
 , libllvm
 , version
@@ -27,7 +28,7 @@ stdenv.mkDerivation rec {
     ./gnu-install-dirs.patch
   ];
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake ninja ];
   buildInputs = [ libllvm libxml2 ];
 
   cmakeFlags = [

pkgs/development/compilers/llvm/git/lldb/default.nix

@@ -2,6 +2,7 @@
 , runCommand
 , monorepoSrc
 , cmake
+, ninja
 , zlib
 , ncurses
 , swig
@@ -49,7 +50,7 @@ stdenv.mkDerivation (rec {
   outputs = [ "out" "lib" "dev" ];
 
   nativeBuildInputs = [
-    cmake python3 which swig lit makeWrapper lua5_3
+    cmake ninja python3 which swig lit makeWrapper lua5_3
   ] ++ lib.optionals enableManpages [
     python3.pkgs.sphinx python3.pkgs.recommonmark
   ];
@@ -120,9 +121,7 @@ stdenv.mkDerivation (rec {
 } // lib.optionalAttrs enableManpages {
   pname = "lldb-manpages";
 
-  buildPhase = ''
-    make docs-lldb-man
-  '';
+  ninjaFlags = [ "docs-lldb-man" ];
 
   propagatedBuildInputs = [];
 

pkgs/development/compilers/llvm/git/llvm/default.nix

@@ -4,6 +4,7 @@
 , runCommand
 , fetchpatch
 , cmake
+, ninja
 , python3
 , libffi
 , enableGoldPlugin ? (!stdenv.isDarwin && !stdenv.targetPlatform.isWasi)
@@ -50,7 +51,7 @@ in stdenv.mkDerivation (rec {
 
   outputs = [ "out" "lib" "dev" "python" ];
 
-  nativeBuildInputs = [ cmake python3 ]
+  nativeBuildInputs = [ cmake ninja python3 ]
     ++ optionals enableManpages [ python3.pkgs.sphinx python3.pkgs.recommonmark ];
 
   buildInputs = [ libxml2 libffi ]
@@ -103,7 +104,7 @@ in stdenv.mkDerivation (rec {
   preConfigure = ''
     # Workaround for configure flags that need to have spaces
     cmakeFlagsArray+=(
-      -DLLVM_LIT_ARGS='-svj''${NIX_BUILD_CORES} --no-progress-bar'
+      -DLLVM_LIT_ARGS="-svj''${NIX_BUILD_CORES} --no-progress-bar"
     )
   '';
 
@@ -245,15 +246,10 @@ in stdenv.mkDerivation (rec {
 } // lib.optionalAttrs enableManpages {
   pname = "llvm-manpages";
 
-  buildPhase = ''
-    make docs-llvm-man
-  '';
-
   propagatedBuildInputs = [];
 
-  installPhase = ''
-    make -C docs install
-  '';
+  ninjaFlags = [ "docs-llvm-man" ];
+  installTargets = [ "install-docs-llvm-man" ];
 
   postPatch = null;
   postInstall = null;

pkgs/development/compilers/llvm/git/openmp/default.nix

@@ -4,6 +4,7 @@
 , monorepoSrc
 , runCommand
 , cmake
+, ninja
 , llvm
 , lit
 , clang-unwrapped
@@ -32,7 +33,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ cmake perl pkg-config lit ];
+  nativeBuildInputs = [ cmake ninja perl pkg-config lit ];
   buildInputs = [ llvm ];
 
   # Unsup:Pass:XFail:Fail