From 16fe4be790f541d68c01897640fda11f9673b8e9 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 13 Jan 2015 10:00:42 -0500 Subject: Add isGNU attribute to gccs --- pkgs/development/compilers/gcc/4.8/default.nix | 2 +- pkgs/development/libraries/glibc/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index a0845b88681b..0fff83fca31f 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -487,7 +487,7 @@ stdenv.mkDerivation ({ else null; passthru = - { inherit langC langCC langObjC langObjCpp langAda langFortran langVhdl langGo version; }; + { inherit langC langCC langObjC langObjCpp langAda langFortran langVhdl langGo version; isGNU = true; }; inherit enableParallelBuilding enableMultilib; diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index 3273b89c84ea..dcd7acf9b854 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -8,7 +8,7 @@ , withGd ? false, gd ? null, libpng ? null }: -assert stdenv.cc ? gcc; +assert stdenv.cc.cc.isGNU or false; let build = import ./common.nix; -- cgit 1.4.1