mcxx: remove build dependency with icc

2020-07-10 16:42:33 +02:00
parent 261d304961
commit 7c68efe743
3 changed files with 27 additions and 4 deletions
--- 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}"
  ];
-    
 }