diff options
| author | Shea Levy <shea@shealevy.com> | 2015-01-13 10:00:42 -0500 |
|---|---|---|
| committer | Eric Seidel <gridaphobe@gmail.com> | 2015-01-14 20:26:57 -0800 |
| commit | 16fe4be790f541d68c01897640fda11f9673b8e9 (patch) | |
| tree | 80937c8e103a9a96fcd3ce9e58f9d241cebded96 | |
| parent | 48f63c2f2e3752df2a0b73cad9b9bba9eda8ac60 (diff) | |
| download | nixpkgs-16fe4be790f541d68c01897640fda11f9673b8e9.tar nixpkgs-16fe4be790f541d68c01897640fda11f9673b8e9.tar.gz nixpkgs-16fe4be790f541d68c01897640fda11f9673b8e9.tar.bz2 nixpkgs-16fe4be790f541d68c01897640fda11f9673b8e9.tar.lz nixpkgs-16fe4be790f541d68c01897640fda11f9673b8e9.tar.xz nixpkgs-16fe4be790f541d68c01897640fda11f9673b8e9.tar.zst nixpkgs-16fe4be790f541d68c01897640fda11f9673b8e9.zip | |
Add isGNU attribute to gccs
| -rw-r--r-- | pkgs/development/compilers/gcc/4.8/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/glibc/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/stdenv/linux/default.nix | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index a0845b88681..0fff83fca31 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 3273b89c84e..dcd7acf9b85 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; diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 63b4c802c89..529593bc059 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -55,6 +55,7 @@ rec { # Needed by the GCC wrapper. langC = true; langCC = true; + isGNU = true; }; |