Compare commits

..

1 Commits

Author SHA1 Message Date
1c56367446 Use gcc 13 for intel compiler 2023
Intel compiler for C++ (icpc) is not able to parse the location of C++
headers from the output of gcc 14, but works fine for gcc 13.
2025-07-21 16:27:23 +02:00

View File

@ -1,5 +1,6 @@
{ stdenv { stdenv
, fetchurl , fetchurl
, ncurses
, lib , lib
, dpkg , dpkg
, rsync , rsync
@ -9,9 +10,12 @@
, hwloc , hwloc
, zlib , zlib
, autoPatchelfHook , autoPatchelfHook
, symlinkJoin
, libfabric , libfabric
, gcc13 , gcc13
, gcc7
, wrapCCWith , wrapCCWith
, linuxHeaders
}: }:
# The distribution of intel packages is a mess. We are doing the installation # The distribution of intel packages is a mess. We are doing the installation
@ -26,8 +30,6 @@
let let
gcc = gcc13;
v = { v = {
hpckit = "2023.1.0"; hpckit = "2023.1.0";
compiler = "2023.1.0"; compiler = "2023.1.0";
@ -411,7 +413,7 @@ let
icx-wrapper = wrapIntel rec { icx-wrapper = wrapIntel rec {
cc = intel-compiler; cc = intel-compiler;
mygcc = gcc; mygcc = gcc13;
extraBuild = '' extraBuild = ''
wrap icx $wrapper $ccPath/icx wrap icx $wrapper $ccPath/icx
wrap icpx $wrapper $ccPath/icpx wrap icpx $wrapper $ccPath/icpx
@ -430,7 +432,7 @@ let
# Intel icc classic compiler tries to behave like the gcc found in $PATH. # Intel icc classic compiler tries to behave like the gcc found in $PATH.
# EVEN if it doesn't support some of the features. See: # EVEN if it doesn't support some of the features. See:
# https://community.intel.com/t5/Intel-C-Compiler/builtin-shuffle-GCC-compatibility-and-has-builtin/td-p/1143619 # https://community.intel.com/t5/Intel-C-Compiler/builtin-shuffle-GCC-compatibility-and-has-builtin/td-p/1143619
mygcc = gcc; mygcc = gcc13;
extraBuild = '' extraBuild = ''
wrap icc $wrapper $ccPath/icc wrap icc $wrapper $ccPath/icc
wrap icpc $wrapper $ccPath/icpc wrap icpc $wrapper $ccPath/icpc
@ -444,7 +446,7 @@ let
ifort-wrapper = wrapIntel rec { ifort-wrapper = wrapIntel rec {
cc = intel-compiler-fortran; cc = intel-compiler-fortran;
mygcc = gcc; mygcc = gcc13;
extraBuild = '' extraBuild = ''
wrap ifort $wrapper $ccPath/ifort wrap ifort $wrapper $ccPath/ifort
''; '';