about summary refs log tree commit diff
path: root/pkgs/development/compilers
diff options
context:
space:
mode:
authorEric Seidel <gridaphobe@gmail.com>2015-03-24 20:37:01 -0700
committerEric Seidel <gridaphobe@gmail.com>2015-03-24 20:37:01 -0700
commit69d02b71a062d8850c0679cacb607318503807c9 (patch)
tree178ed9e1c2f706558a84e788c1e60a29f38a4bba /pkgs/development/compilers
parent6f025832b5ba315a7c008b76772e1ce06ddc5d52 (diff)
downloadnixlib-69d02b71a062d8850c0679cacb607318503807c9.tar
nixlib-69d02b71a062d8850c0679cacb607318503807c9.tar.gz
nixlib-69d02b71a062d8850c0679cacb607318503807c9.tar.bz2
nixlib-69d02b71a062d8850c0679cacb607318503807c9.tar.lz
nixlib-69d02b71a062d8850c0679cacb607318503807c9.tar.xz
nixlib-69d02b71a062d8850c0679cacb607318503807c9.tar.zst
nixlib-69d02b71a062d8850c0679cacb607318503807c9.zip
clang: add isClang passthru attribute to mirror isGNU
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r--pkgs/development/compilers/llvm/3.3/clang.nix6
-rw-r--r--pkgs/development/compilers/llvm/3.4/clang.nix11
-rw-r--r--pkgs/development/compilers/llvm/3.5/clang.nix4
-rw-r--r--pkgs/development/compilers/llvm/3.6/clang/default.nix4
4 files changed, 18 insertions, 7 deletions
diff --git a/pkgs/development/compilers/llvm/3.3/clang.nix b/pkgs/development/compilers/llvm/3.3/clang.nix
index 0e8fd29dc9e3..316730fe3ba0 100644
--- a/pkgs/development/compilers/llvm/3.3/clang.nix
+++ b/pkgs/development/compilers/llvm/3.3/clang.nix
@@ -29,7 +29,11 @@ stdenv.mkDerivation {
       sha256 = "15mrvw43s4frk1j49qr4v5viq68h8qlf10qs6ghd6mrsmgj5vddi";
   };
 
-  passthru = { cc = stdenv.cc.cc; gcc = gccReal; };
+  passthru = {
+    isClang = true;
+    cc = stdenv.cc.cc;
+    gcc = gccReal;
+  };
 
   meta = {
     homepage = http://clang.llvm.org/;
diff --git a/pkgs/development/compilers/llvm/3.4/clang.nix b/pkgs/development/compilers/llvm/3.4/clang.nix
index 4c962cb2d263..cd060e3a65d9 100644
--- a/pkgs/development/compilers/llvm/3.4/clang.nix
+++ b/pkgs/development/compilers/llvm/3.4/clang.nix
@@ -34,10 +34,13 @@ stdenv.mkDerivation {
     ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/
   '';
 
-  passthru.cc = stdenv.cc.cc;
-  # GCC_INSTALL_PREFIX points here, so just use it even though it may not
-  # actually be a gcc
-  passthru.gcc = stdenv.cc.cc;
+  passthru = {
+    isClang = true;
+    cc = stdenv.cc.cc;
+    # GCC_INSTALL_PREFIX points here, so just use it even though it may not
+    # actually be a gcc
+    gcc = stdenv.cc.cc;
+  };
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/compilers/llvm/3.5/clang.nix b/pkgs/development/compilers/llvm/3.5/clang.nix
index 93e0056fb92d..2398b0c59ac5 100644
--- a/pkgs/development/compilers/llvm/3.5/clang.nix
+++ b/pkgs/development/compilers/llvm/3.5/clang.nix
@@ -39,7 +39,9 @@ in stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  passthru = stdenv.lib.optionalAttrs stdenv.isLinux {
+  passthru = {
+    isClang = true;
+  } // stdenv.lib.optionalAttrs stdenv.isLinux {
     inherit gcc;
   };
 
diff --git a/pkgs/development/compilers/llvm/3.6/clang/default.nix b/pkgs/development/compilers/llvm/3.6/clang/default.nix
index 2216dad3ef8e..7be535ada1e5 100644
--- a/pkgs/development/compilers/llvm/3.6/clang/default.nix
+++ b/pkgs/development/compilers/llvm/3.6/clang/default.nix
@@ -40,7 +40,9 @@ in stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  passthru = stdenv.lib.optionalAttrs stdenv.isLinux {
+  passthru = {
+    isClang = true;
+  } // stdenv.lib.optionalAttrs stdenv.isLinux {
     inherit gcc;
   };