Unverified Commit 99df680e authored by Randy Eckenrode's avatar Randy Eckenrode
Browse files

llvmPackages_{12,13,14,15,16,17,18,git}: use fixpoint instead of rec 

Currently, overriding llvmPackages.libllvm doesn’t work correctly. The
original version of libllvm will also be built because it is referenced
by libclang. Switching to the fixpoint allows the override to be
propagated to clang as expected. This will be needed for future Darwin
stdenv bootstrap improvements.
parent 67184532

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

+2 −2
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ let 
    then tools.bintools

    else bootBintools;



  in rec {

  in {



    libllvm = callPackage ./llvm {

      inherit llvm_meta;
@@ -74,7 +74,7 @@ let 
        ./clang/gnu-install-dirs.patch

        (substituteAll {

          src = ../common/clang/clang-11-15-LLVMgold-path.patch;

          libllvmLibdir = "${libllvm.lib}/lib";

          libllvmLibdir = "${tools.libllvm.lib}/lib";

        })

      ];

      inherit clang-tools-extra_src llvm_meta;

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

+2 −2
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ in let 
    then tools.bintools

    else bootBintools;



  in rec {

  in {



    libllvm = callPackage ./llvm {

      inherit llvm_meta;
@@ -105,7 +105,7 @@ in let 
        ../common/clang/add-nostdlibinc-flag.patch

        (substituteAll {

          src = ../common/clang/clang-11-15-LLVMgold-path.patch;

          libllvmLibdir = "${libllvm.lib}/lib";

          libllvmLibdir = "${tools.libllvm.lib}/lib";

        })

      ];

      inherit llvm_meta;

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

+2 −2
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ in let 
    then tools.bintools

    else bootBintools;



  in rec {

  in {



    libllvm = callPackage ./llvm {

      inherit llvm_meta;
@@ -96,7 +96,7 @@ in let 
        ../common/clang/add-nostdlibinc-flag.patch

        (substituteAll {

          src = ../common/clang/clang-11-15-LLVMgold-path.patch;

          libllvmLibdir = "${libllvm.lib}/lib";

          libllvmLibdir = "${tools.libllvm.lib}/lib";

        })

      ];

      inherit llvm_meta;

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

+2 −2
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ in let 
    then tools.bintools

    else bootBintools;



  in rec {

  in {



    libllvm = callPackage ./llvm {

      inherit llvm_meta;
@@ -102,7 +102,7 @@ in let 
        ../common/clang/add-nostdlibinc-flag.patch

        (substituteAll {

          src = ../common/clang/clang-11-15-LLVMgold-path.patch;

          libllvmLibdir = "${libllvm.lib}/lib";

          libllvmLibdir = "${tools.libllvm.lib}/lib";

        })

      ];

      inherit llvm_meta;

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

+2 −2
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ in let 
    then tools.bintools

    else bootBintools;



  in rec {

  in {



    libllvm = callPackage ./llvm {

      inherit llvm_meta;
@@ -103,7 +103,7 @@ in let 
        ../common/clang/add-nostdlibinc-flag.patch

        (substituteAll {

          src = ../common/clang/clang-at-least-16-LLVMgold-path.patch;

         libllvmLibdir = "${libllvm.lib}/lib";

          libllvmLibdir = "${tools.libllvm.lib}/lib";

        })

      ];

      inherit llvm_meta;