cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

llvmPackage: Only force GCC stdenv for native x86_32

Browse source 
Per ee35de1861 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: John Ericson <git@JohnEricson.me>
This commit is contained in:
Giulio De Pasquale 2022-04-15 00:31:58 +02:00
parent abe23368de
commit cad35edf30
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/top-level/all-packages.nix
View file

@ -13268,7 +13268,7 @@ with pkgs;
inherit (stdenvAdapters) overrideCC; inherit (stdenvAdapters) overrideCC;
buildLlvmTools = buildPackages.llvmPackages_11.tools; buildLlvmTools = buildPackages.llvmPackages_11.tools;
targetLlvmLibraries = targetPackages.llvmPackages_11.libraries or llvmPackages_11.libraries; 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; stdenv = gcc7Stdenv;
})); }));
@ -13276,7 +13276,7 @@ with pkgs;
inherit (stdenvAdapters) overrideCC; inherit (stdenvAdapters) overrideCC;
buildLlvmTools = buildPackages.llvmPackages_12.tools; buildLlvmTools = buildPackages.llvmPackages_12.tools;
targetLlvmLibraries = targetPackages.llvmPackages_12.libraries or llvmPackages_12.libraries; 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; stdenv = gcc7Stdenv;
})); }));
@ -13284,7 +13284,7 @@ with pkgs;
inherit (stdenvAdapters) overrideCC; inherit (stdenvAdapters) overrideCC;
buildLlvmTools = buildPackages.llvmPackages_13.tools; buildLlvmTools = buildPackages.llvmPackages_13.tools;
targetLlvmLibraries = targetPackages.llvmPackages_13.libraries or llvmPackages_13.libraries; 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; stdenv = gcc7Stdenv;
})); }));
@ -13292,7 +13292,7 @@ with pkgs;
inherit (stdenvAdapters) overrideCC; inherit (stdenvAdapters) overrideCC;
buildLlvmTools = buildPackages.llvmPackages_14.tools; buildLlvmTools = buildPackages.llvmPackages_14.tools;
targetLlvmLibraries = targetPackages.llvmPackages_14.libraries or llvmPackages_14.libraries; 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; stdenv = gcc7Stdenv;
})); }));