icc2021: added stdc++ includes

This commit is contained in:
Raúl Peñacoba 2021-07-05 17:06:23 +02:00 committed by Rodrigo Arias Mallo
parent ef5e98e06d
commit 5789b4a77a
2 changed files with 3 additions and 1 deletions

View File

@ -14,6 +14,8 @@ in wrapCCWith rec {
echo "-B${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-cflags echo "-B${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-cflags
echo "-isystem ${iccUnwrapped}/include" >> $out/nix-support/cc-cflags echo "-isystem ${iccUnwrapped}/include" >> $out/nix-support/cc-cflags
echo "-isystem ${iccUnwrapped}/include/icc" >> $out/nix-support/cc-cflags echo "-isystem ${iccUnwrapped}/include/icc" >> $out/nix-support/cc-cflags
echo "-isystem ${gcc.cc}/include/c++/${gcc.version}" >> $out/nix-support/cc-cflags
echo "-isystem ${gcc.cc}/include/c++/${gcc.version}/${targetConfig}" >> $out/nix-support/cc-cflags
echo "-L${iccUnwrapped}/lib" >> $out/nix-support/cc-ldflags echo "-L${iccUnwrapped}/lib" >> $out/nix-support/cc-ldflags
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

View File

@ -48,7 +48,7 @@ let
icc2021 = appendPasstru (callPackage ./bsc/intel-compiler/wrapper2021.nix { icc2021 = appendPasstru (callPackage ./bsc/intel-compiler/wrapper2021.nix {
iccUnwrapped = bsc.icc2021Unwrapped; iccUnwrapped = bsc.icc2021Unwrapped;
}) { CC = "icc"; CXX = "icpc"; }; }) { CC = "icx"; CXX = "icpx"; };
icc = bsc.icc2020; icc = bsc.icc2020;