Commit cad35edf authored by Giulio De Pasquale's avatar Giulio De Pasquale
Browse files

llvmPackage: Only force GCC stdenv for native x86_32 



Per ee35de18 the condition that was
there before was not quite right, to avoid infinite recurion. This one
is probably also not quite right, but good enough for now.

Co-Authored-By: default avatarJohn Ericson <git@JohnEricson.me>
parent abe23368

pkgs/top-level/all-packages.nix

+4 −4
Original line number Diff line number Diff line
@@ -13268,7 +13268,7 @@ with pkgs; 
    inherit (stdenvAdapters) overrideCC;

    buildLlvmTools = buildPackages.llvmPackages_11.tools;

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

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

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

    stdenv = gcc7Stdenv;

  }));









@@ -13276,7 +13276,7 @@ with pkgs;













    inherit (stdenvAdapters) overrideCC;















    buildLlvmTools = buildPackages.llvmPackages_12.tools;















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













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













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















    stdenv = gcc7Stdenv;















  }));























@@ -13284,7 +13284,7 @@ with pkgs;













    inherit (stdenvAdapters) overrideCC;















    buildLlvmTools = buildPackages.llvmPackages_13.tools;















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













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













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















    stdenv = gcc7Stdenv;















  }));























@@ -13292,7 +13292,7 @@ with pkgs;













    inherit (stdenvAdapters) overrideCC;















    buildLlvmTools = buildPackages.llvmPackages_14.tools;















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













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













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















    stdenv = gcc7Stdenv;















  }));