public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7817 from gridaphobe/cc-wrapper-isgnu-isclang

Browse Source 
Add isGNU and isClang attributes to cc-wrapper
This commit is contained in:
Eric Seidel
2015-05-14 10:09:07 -07:00
parent 221c45d51f 662a6b1ca6
commit 67fe5d46d4
30 changed files with 42 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/gcl/default.nix
View File

@@ -10,7 +10,7 @@ in
(
assert a.stdenv ? cc ;
assert a.stdenv.cc.cc.isGNU or false ;
assert a.stdenv.cc.isGNU ;
assert a.stdenv.cc ? libc ;
assert a.stdenv.cc.libc != null ;

2
pkgs/development/compilers/llvm/3.5/clang.nix
View File

@@ -1,6 +1,6 @@
{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, clang-tools-extra_src }:
let
gcc = if stdenv.cc.cc.isGNU or false then stdenv.cc.cc else stdenv.cc.cc.gcc;
gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
in stdenv.mkDerivation {
name = "clang-${version}";

2
pkgs/development/compilers/llvm/3.6/clang/default.nix
View File

@@ -1,7 +1,7 @@
{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, clang-tools-extra_src }:
let
gcc = if stdenv.cc.cc.isGNU or false then stdenv.cc.cc else stdenv.cc.cc.gcc;
gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
in stdenv.mkDerivation {
name = "clang-${version}";