From 7c68efe743cce3831d083e5af780f2fc440ac0e8 Mon Sep 17 00:00:00 2001
From: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
Date: Fri, 10 Jul 2020 16:42:33 +0200
Subject: [PATCH] mcxx: remove build dependency with icc

---
 bsc/mcxx/default.nix | 11 ++++++++---
 bsc/mcxx/intel.patch | 19 +++++++++++++++++++
 default.nix          |  1 -
 3 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 bsc/mcxx/intel.patch

diff --git a/bsc/mcxx/default.nix b/bsc/mcxx/default.nix
index e021e17..7766567 100644
--- a/bsc/mcxx/default.nix
+++ b/bsc/mcxx/default.nix
@@ -10,7 +10,6 @@
 , flex
 , bison
 , gcc
-, icc
 }:
 
 stdenv.mkDerivation rec {
@@ -38,12 +37,18 @@ stdenv.mkDerivation rec {
     bison
     flex
     gcc
-    icc
   ];
 
+  patches = [ ./intel.patch ];
+
+  preConfigure = ''
+    export ICC=icc
+    export ICPC=icpc
+    export IFORT=ifort
+  '';
+
   configureFlags = [
     "--enable-ompss-2"
     "--with-nanos6=${nanos6}"
   ];
-    
 }
diff --git a/bsc/mcxx/intel.patch b/bsc/mcxx/intel.patch
new file mode 100644
index 0000000..85429cb
--- /dev/null
+++ b/bsc/mcxx/intel.patch
@@ -0,0 +1,19 @@
+--- a/configure.ac	2020-07-10 16:15:11.431606455 +0200
++++ b/configure.ac	2020-07-10 16:15:24.291586572 +0200
+@@ -367,16 +367,6 @@
+   [ enable_intel_compilers="yes"])
+ AC_MSG_RESULT([$enable_intel_compilers])
+ 
+-
+-IFORT=
+-ICC=
+-ICPC=
+-if test x"$enable_intel_compilers" = x"yes";
+-then
+-   AC_CHECK_PROG([IFORT], [ifort], [ifort])
+-   AC_CHECK_PROG([ICC], [icc], [icc])
+-   AC_CHECK_PROG([ICPC], [icpc], [icpc])
+-fi
+ dnl --------------- END Intel Compilers ---------------------
+ 
+ mic_compilation="no"
diff --git a/default.nix b/default.nix
index 1e10e04..3574ec0 100644
--- a/default.nix
+++ b/default.nix
@@ -72,7 +72,6 @@ let
     };
 
     mcxx = callPackage ./bsc/mcxx/default.nix {
-      icc = icc;
       stdenv = pkgs.gcc9Stdenv;
       nanos6 = nanos6-git;
     };