Use gcc13 for intel compiler

This should be a noop

pkgs/intel-oneapi/2023.nix

@@ -299,6 +299,9 @@ let
       "intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic-common-${version}"
       "intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic-runtime-${version}"
       "intel-oneapi-compiler-dpcpp-cpp-classic-fortran-shared-runtime-${version}"
+      "intel-oneapi-compiler-shared-${version}"
+      "intel-oneapi-compiler-shared-common-${version}"
+      "intel-oneapi-compiler-shared-runtime-${version}"
     ];
     dontCheckForBrokenSymlinks = true;
     # From https://aur.archlinux.org/packages/intel-oneapi-compiler:
@@ -316,9 +319,9 @@ let
     # - intel-oneapi-compiler-fortran-common-2023.0.0-2023.0.0-25370_all.deb
     # - intel-oneapi-compiler-fortran-runtime-2023.0.0-2023.0.0-25370_amd64.deb
     # - intel-oneapi-compiler-fortran-runtime-2023.0.0-25370_amd64.deb
-    # - intel-oneapi-compiler-shared-2023.0.0-2023.0.0-25370_amd64.deb
-    # - intel-oneapi-compiler-shared-common-2023.0.0-2023.0.0-25370_all.deb
-    # - intel-oneapi-compiler-shared-runtime-2023.0.0-2023.0.0-25370_amd64.deb
+    # + intel-oneapi-compiler-shared-2023.0.0-2023.0.0-25370_amd64.deb
+    # + intel-oneapi-compiler-shared-common-2023.0.0-2023.0.0-25370_all.deb
+    # + intel-oneapi-compiler-shared-runtime-2023.0.0-2023.0.0-25370_amd64.deb
     # - intel-oneapi-dpcpp-cpp-2023.0.0-2023.0.0-25370_amd64.deb
     # - intel-oneapi-openmp-2023.0.0-2023.0.0-25370_amd64.deb
     # - intel-oneapi-openmp-common-2023.0.0-2023.0.0-25370_all.deb
@@ -385,6 +388,15 @@ let
         echo "-L${intel-compiler-shared}/lib" >> $out/nix-support/cc-ldflags
         echo "-L${cc}/lib" >> $out/nix-support/cc-ldflags
 
+        echo "--gcc-toolchain=${mygcc.cc}" >> $out/nix-support/libcxx-cxxflags
+
+        for dir in ${mygcc.cc}/include/c++/*; do
+          echo "-isystem $dir" >> $out/nix-support/libcxx-cxxflags
+        done
+        for dir in ${mygcc.cc}/include/c++/*/${targetConfig}; do
+          echo "-isystem $dir" >> $out/nix-support/libcxx-cxxflags
+        done
+
         # Need the gcc in the path
         # FIXME: We should find a better way to modify the PATH instead of using
         # this ugly hack. See https://jungle.bsc.es/git/rarias/bscpkgs/issues/9

pkgs/llvm-ompss2/default.nix

@@ -45,6 +45,9 @@ let
     echo "-L${gcc.cc}/lib/gcc/${targetConfig}/${gccVersion}" >> $out/nix-support/cc-ldflags
     echo "-L${gcc.cc.lib}/lib" >> $out/nix-support/cc-ldflags
 
+    for dir in ${gcc.cc}/lib/gcc/${targetConfig}/*/include; do
+      echo "-isystem $dir" >> $out/nix-support/cc-cflags
+    done
     for dir in ${gcc.cc}/include/c++/*; do
       echo "-isystem $dir" >> $out/nix-support/libcxx-cxxflags
     done