From 0f66b8cb2066b9498776d46b2c3473f4cd06caea Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 9 Feb 2013 10:01:02 -0500
Subject: [PATCH] gcc46_multi: Don't try to build on non-64-bit-linux
---
pkgs/top-level/all-packages.nix | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ab680b665b2b..be69751947c0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2135,11 +2135,12 @@ let
binutilsCross = null;
}));
- gcc46_multi = lowPrio (wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi (gcc46.gcc.override {
- stdenv = overrideGCC stdenv (wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi gcc);
- profiledCompiler = false;
- enableMultilib = true;
- }));
+ gcc46_multi = if system == "x86_64-linux" then lowPrio (
+ wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi (gcc46.gcc.override {
+ stdenv = overrideGCC stdenv (wrapGCCWith (import ../build-support/gcc-wrapper) glibc_multi gcc);
+ profiledCompiler = false;
+ enableMultilib = true;
+ })) else throw "Multilib gcc not supported on this system";
gcc47_real = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.7 {
inherit noSysDirs;