From 512847a498dcb345a1927f47d2fb453a200502ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aleix=20Bon=C3=A9?= <aleix.boneribo@bsc.es>
Date: Tue, 16 Sep 2025 14:52:56 +0200
Subject: [PATCH] Use gcc13 for llvm-ompss2 for intel

---
 overlay.nix                  | 2 +-
 pkgs/llvm-ompss2/default.nix | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/overlay.nix b/overlay.nix
index 2c8f9f2d..fed652b8 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -62,9 +62,9 @@ let
     stdenvClangOmpss2NodesOmpv = final.stdenv.override { cc = final.clangOmpss2NodesOmpv; allowedRequisites = null; };
     tagaspi = callPackage ./pkgs/tagaspi/default.nix { };
     tampi = callPackage ./pkgs/tampi/default.nix { };
-    upc-qaire-exporter = prev.callPackage ./pkgs/upc-qaire-exporter/default.nix { };
     tasycl = callPackage ./pkgs/tasycl/default.nix { };
     tasycl-acpp = callPackage ./pkgs/tasycl/default.nix { useIntel = false; };
+    upc-qaire-exporter = prev.callPackage ./pkgs/upc-qaire-exporter/default.nix { };
     wxparaver = callPackage ./pkgs/paraver/default.nix { };
   };
 
diff --git a/pkgs/llvm-ompss2/default.nix b/pkgs/llvm-ompss2/default.nix
index e46878c5..42865ed3 100644
--- a/pkgs/llvm-ompss2/default.nix
+++ b/pkgs/llvm-ompss2/default.nix
@@ -2,6 +2,7 @@
   stdenv
 , lib
 , gcc
+, gcc13
 , clangOmpss2Unwrapped
 , writeShellScript
 , openmp ? null
@@ -92,7 +93,8 @@ let
   '';
 
   wrappedCCIntel = wrapCCWith {
-    inherit cc bintools extraPackages;
+    inherit bintools extraPackages;
+    cc = cc.override { gcc = gcc13; }; # Intel uses gcc13, so we have to match it
     # extraPackages adds packages to depsTargetTargetPropagated
     extraBuildCommands = intelExtraBuildCommands + envExports;
   };