git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #149523 from Ericson2314/llvm-libs-fixup

llvmPackages: Make sure we can attempt to cross-compile the tools

commit5753b8915228b2e09e41743fe12a942c7ccce70f authorJohn Ericson <git@JohnEricson.me> dateWed 8 Dec 2021, 00:32 (5 years ago) parent1b4fb030c9716a
1 file changed+8−8
compare with master
unifiedsplit
pkgs/top-level/all-packages.nix+8−8
pkgs/top-level/all-packages.nix+8−8
@@ -12513,31 +12513,31 @@ with pkgs;
1251312513 llvmPackages_5 = recurseIntoAttrs (callPackage ../development/compilers/llvm/5 {
1251412514 inherit (stdenvAdapters) overrideCC;
1251512515 buildLlvmTools = buildPackages.llvmPackages_5.tools;
12516− targetLlvmLibraries = targetPackages.llvmPackages_5.libraries;
12516+ targetLlvmLibraries = targetPackages.llvmPackages_5.libraries or llvmPackages_5.libraries;
1251712517 });
1251812518
1251912519 llvmPackages_6 = recurseIntoAttrs (callPackage ../development/compilers/llvm/6 {
1252012520 inherit (stdenvAdapters) overrideCC;
1252112521 buildLlvmTools = buildPackages.llvmPackages_6.tools;
12522− targetLlvmLibraries = targetPackages.llvmPackages_6.libraries;
12522+ targetLlvmLibraries = targetPackages.llvmPackages_6.libraries or llvmPackages_6.libraries;
1252312523 });
1252412524
1252512525 llvmPackages_7 = recurseIntoAttrs (callPackage ../development/compilers/llvm/7 {
1252612526 inherit (stdenvAdapters) overrideCC;
1252712527 buildLlvmTools = buildPackages.llvmPackages_7.tools;
12528− targetLlvmLibraries = targetPackages.llvmPackages_7.libraries;
12528+ targetLlvmLibraries = targetPackages.llvmPackages_7.libraries or llvmPackages_7.libraries;
1252912529 });
1253012530
1253112531 llvmPackages_8 = recurseIntoAttrs (callPackage ../development/compilers/llvm/8 {
1253212532 inherit (stdenvAdapters) overrideCC;
1253312533 buildLlvmTools = buildPackages.llvmPackages_8.tools;
12534− targetLlvmLibraries = targetPackages.llvmPackages_8.libraries;
12534+ targetLlvmLibraries = targetPackages.llvmPackages_8.libraries or llvmPackages_8.libraries;
1253512535 });
1253612536
1253712537 llvmPackages_9 = recurseIntoAttrs (callPackage ../development/compilers/llvm/9 {
1253812538 inherit (stdenvAdapters) overrideCC;
1253912539 buildLlvmTools = buildPackages.llvmPackages_9.tools;
12540− targetLlvmLibraries = targetPackages.llvmPackages_9.libraries;
12540+ targetLlvmLibraries = targetPackages.llvmPackages_9.libraries or llvmPackages_9.libraries;
1254112541 });
1254212542
1254312543 llvmPackages_10 = recurseIntoAttrs (callPackage ../development/compilers/llvm/10 {
@@ -12549,7 +12549,7 @@ with pkgs;
1254912549 llvmPackages_11 = recurseIntoAttrs (callPackage ../development/compilers/llvm/11 ({
1255012550 inherit (stdenvAdapters) overrideCC;
1255112551 buildLlvmTools = buildPackages.llvmPackages_11.tools;
12552− targetLlvmLibraries = targetPackages.llvmPackages_11.libraries;
12552+ targetLlvmLibraries = targetPackages.llvmPackages_11.libraries or llvmPackages_11.libraries;
1255312553 } // lib.optionalAttrs (stdenv.hostPlatform.isi686 && buildPackages.stdenv.cc.isGNU) {
1255412554 stdenv = gcc7Stdenv;
1255512555 }));
@@ -12557,7 +12557,7 @@ with pkgs;
1255712557 llvmPackages_12 = recurseIntoAttrs (callPackage ../development/compilers/llvm/12 ({
1255812558 inherit (stdenvAdapters) overrideCC;
1255912559 buildLlvmTools = buildPackages.llvmPackages_12.tools;
12560− targetLlvmLibraries = targetPackages.llvmPackages_12.libraries;
12560+ targetLlvmLibraries = targetPackages.llvmPackages_12.libraries or llvmPackages_12.libraries;
1256112561 } // lib.optionalAttrs (stdenv.hostPlatform.isi686 && buildPackages.stdenv.cc.isGNU) {
1256212562 stdenv = gcc7Stdenv;
1256312563 }));
@@ -12565,7 +12565,7 @@ with pkgs;
1256512565 llvmPackages_13 = recurseIntoAttrs (callPackage ../development/compilers/llvm/13 ({
1256612566 inherit (stdenvAdapters) overrideCC;
1256712567 buildLlvmTools = buildPackages.llvmPackages_13.tools;
12568− targetLlvmLibraries = targetPackages.llvmPackages_13.libraries;
12568+ targetLlvmLibraries = targetPackages.llvmPackages_13.libraries or llvmPackages_13.libraries;
1256912569 } // lib.optionalAttrs (stdenv.hostPlatform.isi686 && buildPackages.stdenv.cc.isGNU) {
1257012570 stdenv = gcc7Stdenv;
1257112571 }));