From f7b1a2ef43c3630a32ffd296a480ae6f0e4b0385 Mon Sep 17 00:00:00 2001
From: Andrea Bocci <andrea.bocci@cern.ch>
Date: Tue, 9 Jul 2024 13:20:24 +0200
Subject: [PATCH] Let icpx find the gcc installation

---
 scram-tools.file/tools/icx/env.sh              | 1 +
 scram-tools.file/tools/icx/icx-cxxcompiler.xml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/scram-tools.file/tools/icx/env.sh b/scram-tools.file/tools/icx/env.sh
index d105f0c12e8..350b4285acb 100644
--- a/scram-tools.file/tools/icx/env.sh
+++ b/scram-tools.file/tools/icx/env.sh
@@ -1,2 +1,3 @@
 source ${SCRAM_TOOLS_BIN_DIR}/os_libdir.sh
 export AT="@"
+export COMPILER_HOST=$(gcc -dumpmachine)
diff --git a/scram-tools.file/tools/icx/icx-cxxcompiler.xml b/scram-tools.file/tools/icx/icx-cxxcompiler.xml
index 4fe139eab9d..2b705657037 100644
--- a/scram-tools.file/tools/icx/icx-cxxcompiler.xml
+++ b/scram-tools.file/tools/icx/icx-cxxcompiler.xml
@@ -18,6 +18,7 @@
     <flags REM_CXXFLAGS="-Werror=return-local-addr"/>
     <flags REM_LDFLAGS="-Wl,--icf=all"/>
     <flags CXXFLAGS="-Wno-unknown-pragmas"/>
+    <flags CXXFLAGS="--target=@COMPILER_HOST@ --gcc-toolchain=$(COMPILER_PATH)"/>
     <flags SKIP_TOOL_SYMLINKS="1"/>
     <architecture name="_mic_">
       <flags CXXFLAGS="-mmic"/>