From b042e783e51ab1646058943cbe72d77132a014dc Mon Sep 17 00:00:00 2001
From: Rodrigo Arias <rodrigo.arias@bsc.es>
Date: Mon, 27 Jul 2020 17:55:35 +0200
Subject: [PATCH] Add CC and CXX names to compilers passthru

---
 bsc/intel-compiler/icc2020.nix | 5 +++++
 bsc/llvm-ompss2/clang.nix      | 5 +++++
 bsc/mcxx/default.nix           | 5 +++++
 3 files changed, 15 insertions(+)

diff --git a/bsc/intel-compiler/icc2020.nix b/bsc/intel-compiler/icc2020.nix
index 7258b3f..17fe3e1 100644
--- a/bsc/intel-compiler/icc2020.nix
+++ b/bsc/intel-compiler/icc2020.nix
@@ -10,6 +10,11 @@ stdenv.mkDerivation rec {
   version = "${year}.${v_a}.${v_b}";
   name = "intel-compiler-${version}";
 
+  passthru = {
+    CC = "icc";
+    CXX = "icpc";
+  };
+
   # From Arch Linux PKGBUILD
   dir_nr="16526";
   year="2020";
diff --git a/bsc/llvm-ompss2/clang.nix b/bsc/llvm-ompss2/clang.nix
index b418760..6c45c36 100644
--- a/bsc/llvm-ompss2/clang.nix
+++ b/bsc/llvm-ompss2/clang.nix
@@ -21,6 +21,11 @@ stdenv.mkDerivation rec {
   isClang = true;
   #isGNU = true;
 
+  passthru = {
+    CC = "clang";
+    CXX = "clang++";
+  };
+
   isClangWithOmpss = true;
 
   buildInputs = [
diff --git a/bsc/mcxx/default.nix b/bsc/mcxx/default.nix
index 7766567..50ba72c 100644
--- a/bsc/mcxx/default.nix
+++ b/bsc/mcxx/default.nix
@@ -17,6 +17,11 @@ stdenv.mkDerivation rec {
   #version attribute ignored when using fetchgit:
   #version = "2.2.0-70a299cf";
 
+  passthru = {
+    CC = "mcc";
+    CXX = "mcxx";
+  };
+
   # Use patched Extrae version
   src = fetchgit {
     url = "https://github.com/bsc-pm/mcxx";