Unverified Commit d3bb925a authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #294805 from wegank/bazel-4-refactor 

bazel_{4,5,6}: refactor stdenv override
parents b1da9437 4a887b5f

pkgs/top-level/all-packages.nix

+14 −9
Original line number Diff line number Diff line
@@ -18344,29 +18344,34 @@ with pkgs; 
    buildJdk = jdk11_headless;

    buildJdkName = "java11";

    runJdk = jdk11_headless;

    stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else gcc10StdenvCompat;

    stdenv = if stdenv.cc.isClang then llvmPackages.stdenv

      else if stdenv.cc.isGNU then gcc10Stdenv

      else stdenv;

    bazel_self = bazel_4;

  };













  bazel_5 = pin-to-gcc12-if-gcc13 (callPackage ../development/tools/build-managers/bazel/bazel_5 {













  bazel_5 = callPackage ../development/tools/build-managers/bazel/bazel_5 {















    inherit (darwin) cctools sigtool;















    inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation;















    buildJdk = jdk11_headless;















    runJdk = jdk11_headless;













    stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv;













    stdenv = if stdenv.cc.isClang then llvmPackages.stdenv













      else if stdenv.cc.isGNU then gcc12Stdenv













      else stdenv;















    bazel_self = bazel_5;













  });













  };



























  bazel_6 = pin-to-gcc12-if-gcc13 (darwin.apple_sdk_11_0.callPackage ../development/tools/build-managers/bazel/bazel_6 {













  bazel_6 = darwin.apple_sdk_11_0.callPackage ../development/tools/build-managers/bazel/bazel_6 {















    inherit (darwin) cctools;















    inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation CoreServices Foundation;















    buildJdk = jdk11_headless;















    runJdk = jdk11_headless;













    stdenv = if stdenv.isDarwin then













      darwin.apple_sdk_11_0.stdenv else













      if stdenv.cc.isClang then llvmPackages.stdenv else stdenv;













    stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv













      else if stdenv.cc.isClang then llvmPackages.stdenv













      else if stdenv.cc.isGNU then gcc12Stdenv













      else stdenv;















    bazel_self = bazel_6;













  });













  };





























  bazel_7 = darwin.apple_sdk_11_0.callPackage ../development/tools/build-managers/bazel/bazel_7 {















    inherit (darwin) cctools sigtool;