diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e78836e068130..563f3d03874b3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5041,42 +5041,36 @@ with pkgs; wrapCCMulti = cc: - if stdenv.targetPlatform.system == "x86_64-linux" then - let - # Binutils with glibc multi - bintools = cc.bintools.override { - libc = glibc_multi; - }; - in - lowPrio (wrapCCWith { - cc = cc.cc.override { - stdenv = overrideCC stdenv (wrapCCWith { - cc = cc.cc; - inherit bintools; - libc = glibc_multi; - }); - profiledCompiler = false; - enableMultilib = true; - }; + let + # Binutils with glibc multi + bintools = cc.bintools.override { libc = glibc_multi; - inherit bintools; - extraBuildCommands = '' - echo "dontMoveLib64=1" >> $out/nix-support/setup-hook - ''; - }) - else - throw "Multilib ${cc.name} not supported for ‘${stdenv.targetPlatform.system}’"; + }; + in + lowPrio (wrapCCWith { + cc = cc.cc.override { + stdenv = overrideCC stdenv (wrapCCWith { + cc = cc.cc; + inherit bintools; + libc = glibc_multi; + }); + profiledCompiler = false; + enableMultilib = true; + }; + libc = glibc_multi; + inherit bintools; + extraBuildCommands = '' + echo "dontMoveLib64=1" >> $out/nix-support/setup-hook + ''; + }); wrapClangMulti = clang: - if stdenv.targetPlatform.system == "x86_64-linux" then - callPackage ../development/compilers/llvm/multi.nix { - inherit clang; - gcc32 = pkgsi686Linux.gcc; - gcc64 = pkgs.gcc; - } - else - throw "Multilib ${clang.cc.name} not supported for '${stdenv.targetPlatform.system}'"; + callPackage ../development/compilers/llvm/multi.nix { + inherit clang; + gcc32 = pkgsi686Linux.gcc; + gcc64 = pkgs.gcc; + }; gcc_multi = wrapCCMulti gcc; clang_multi = wrapClangMulti clang;