Unverified Commit 912056c7 authored by Rahul Butani's avatar Rahul Butani
Browse files

llvmPackages_15: switch to using `ninja`

parent 19d1571e

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

+3 −5
Original line number Diff line number Diff line 
{ 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;
@@ -114,9 +114,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/15/compiler-rt/default.nix

+2 −2
Original line number Diff line number Diff line 
{ 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/15/default.nix

+3 −3
Original line number Diff line number Diff line 
{ lowPrio, newScope, pkgs, lib, stdenv, stdenvNoCC, cmake

{ lowPrio, newScope, pkgs, lib, stdenv, stdenvNoCC, cmake, ninja

, gccForLibs, preLibcCrossHeaders

, libxml2, python3, isl, fetchFromGitHub, overrideCC, wrapCCWith, wrapBintoolsWith

, buildLlvmTools # tools, but from the previous stage, for cross
@@ -41,7 +41,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/15/libcxx/default.nix

+3 −3
Original line number Diff line number Diff line 
{ 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 ];
@@ -88,7 +88,7 @@ stdenv.mkDerivation rec { 
      "-DCMAKE_CXX_COMPILER_WORKS=ON"

    ];



  buildFlags = lib.optional headersOnly "generate-cxx-headers";

  ninjaFlags = lib.optional headersOnly "generate-cxx-headers";

  installTargets = lib.optional headersOnly "install-cxx-headers";



  passthru = {

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

+2 −2
Original line number Diff line number Diff line 
{ 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 = [