Unverified Commit 94a3d6ef authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge #184408: llvmPackages_{11,12,13,14}: remove stdenv override

parents 3586ad34 eca87f71

pkgs/top-level/all-packages.nix

+0 −8
Original line number Diff line number Diff line
@@ -14716,8 +14716,6 @@ with pkgs; 
    buildLlvmTools = buildPackages.llvmPackages_11.tools;

    targetLlvmLibraries = targetPackages.llvmPackages_11.libraries or llvmPackages_11.libraries;

    targetLlvm = targetPackages.llvmPackages_11.llvm or llvmPackages_11.llvm;

  } // lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.hostPlatform == stdenv.buildPlatform && buildPackages.stdenv.cc.isGNU) {

    stdenv = gcc7Stdenv;

  }));















  llvmPackages_12 = recurseIntoAttrs (callPackage ../development/compilers/llvm/12 ({









@@ -14725,8 +14723,6 @@ with pkgs;













    buildLlvmTools = buildPackages.llvmPackages_12.tools;















    targetLlvmLibraries = targetPackages.llvmPackages_12.libraries or llvmPackages_12.libraries;















    targetLlvm = targetPackages.llvmPackages_12.llvm or llvmPackages_12.llvm;













  } // lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.hostPlatform == stdenv.buildPlatform && buildPackages.stdenv.cc.isGNU) {













    stdenv = gcc7Stdenv;















  }));





























  llvmPackages_13 = recurseIntoAttrs (callPackage ../development/compilers/llvm/13 ({









@@ -14734,8 +14730,6 @@ with pkgs;













    buildLlvmTools = buildPackages.llvmPackages_13.tools;















    targetLlvmLibraries = targetPackages.llvmPackages_13.libraries or llvmPackages_13.libraries;















    targetLlvm = targetPackages.llvmPackages_13.llvm or llvmPackages_13.llvm;













  } // lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.hostPlatform == stdenv.buildPlatform && buildPackages.stdenv.cc.isGNU) {













    stdenv = gcc7Stdenv;















  }));





























  llvmPackages_14 = recurseIntoAttrs (callPackage ../development/compilers/llvm/14 ({









@@ -14743,8 +14737,6 @@ with pkgs;













    buildLlvmTools = buildPackages.llvmPackages_14.tools;















    targetLlvmLibraries = targetPackages.llvmPackages_14.libraries or llvmPackages_14.libraries;















    targetLlvm = targetPackages.llvmPackages_14.llvm or llvmPackages_14.llvm;













  } // lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.hostPlatform == stdenv.buildPlatform && buildPackages.stdenv.cc.isGNU) {













    stdenv = gcc7Stdenv;















  }));





























  llvmPackages_latest = llvmPackages_14;