rarias/bscpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use last intel compiler 2020 version

Browse Source
This commit is contained in:
Rodrigo Arias 2020-07-02 15:32:52 +02:00
parent 8032825765
commit 940c494d8e
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bsc/intel-compiler/default.nix
View File

@ -5,7 +5,7 @@
, icc-unwrapped , icc-unwrapped
, wrapCCWith , wrapCCWith
, libstdcxxHook , libstdcxxHook
, intel-license , icc-license
}: }:
let let
@ -19,7 +19,7 @@ in wrapCCWith rec {
echo "-L${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-ldflags echo "-L${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-ldflags
echo "-L${gcc.cc.lib}/lib" >> $out/nix-support/cc-ldflags echo "-L${gcc.cc.lib}/lib" >> $out/nix-support/cc-ldflags
echo "export INTEL_LICENSE_FILE=${intel-license}" \ echo "export INTEL_LICENSE_FILE=${icc-license}" \
>> $out/nix-support/setup-hook >> $out/nix-support/setup-hook
# Create the wrappers for icc and icpc # Create the wrappers for icc and icpc

4
bsc/intel-compiler/icc.nix → bsc/intel-compiler/icc2020.nix
View File

@ -6,11 +6,11 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2019.1.217"; version = "${year}.${v_a}.${v_b}";
name = "intel-compiler-${version}"; name = "intel-compiler-${version}";
# From Arch Linux PKGBUILD # From Arch Linux PKGBUILD
dir_nr="16526"; dir_nr="16527";
year="2020"; year="2020";
v_a="1"; v_a="1";
v_b="217"; v_b="217";

8
default.nix
View File

@ -43,11 +43,15 @@ let
enableDebug = false; enableDebug = false;
}; };
icc-unwrapped = callPackage ./bsc/intel-compiler/icc.nix { # By default we use Intel compiler 2020 update 1
icc-unwrapped = icc2020-unwrapped;
icc2020-unwrapped = callPackage ./bsc/intel-compiler/icc2020.nix {
}; };
# A wrapper script that puts all the flags and environment vars properly and
# calls the intel compiler binary
icc = callPackage bsc/intel-compiler/default.nix { icc = callPackage bsc/intel-compiler/default.nix {
intel-license = icc-license; inherit icc-unwrapped icc-license;
}; };
icc-license = callPackage bsc/intel-compiler/license.nix { icc-license = callPackage bsc/intel-compiler/license.nix {