From a30086c8d520cf9e0725a7dea74895f92c152078 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 7 Dec 2012 15:13:39 +0000 Subject: [PATCH] Disabling ppl and cloog on gcc for raspberrypi. Shorter stdenv builds. --- pkgs/stdenv/linux/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 6a202951c7c..d8b404cc776 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -239,7 +239,8 @@ rec { inherit (stdenvLinuxBoot3Pkgs) binutils; coreutils = bootstrapTools; libc = stdenvLinuxGlibc; - gcc = stdenvLinuxBoot3Pkgs.gcc.gcc; + gcc = stdenvLinuxBoot3Pkgs.gcc.gcc.override (if platform.name == "raspberrypi" then + { ppl = null; cloog = null; } else {}); name = ""; }; extraPath = [ stdenvLinuxBoot3Pkgs.xz ]; @@ -278,7 +279,7 @@ rec { inherit (stdenvLinuxBoot3Pkgs) binutils; inherit (stdenvLinuxBoot4Pkgs) coreutils; libc = stdenvLinuxGlibc; - gcc = stdenvLinuxBoot3Pkgs.gcc.gcc; + gcc = stdenvLinuxBoot4.gcc.gcc; shell = stdenvLinuxBoot4Pkgs.bash + "/bin/bash"; name = ""; };