Use explicit GCC install dir for Intel SYCL

Author: allnes

scripts/ci/sycl_configure.py

@@ -52,6 +52,19 @@ def main() -> None:
     if itlabai_sycl_targets:
         cmake_args.append(f"-DITLABAI_SYCL_TARGETS={itlabai_sycl_targets}")
 
+    c_flags = os.environ.get("ITLABAI_C_FLAGS", "")
+    cxx_flags = os.environ.get("ITLABAI_CXX_FLAGS", "")
+    gcc_install_dir = os.environ.get("ITLABAI_GCC_INSTALL_DIR", "")
+    if gcc_install_dir:
+        gcc_toolchain_flag = f"--gcc-install-dir={gcc_install_dir}"
+        cmake_args.append(f"-DCMAKE_C_FLAGS={gcc_toolchain_flag} {c_flags}".strip())
+        cmake_args.append(f"-DCMAKE_CXX_FLAGS={gcc_toolchain_flag} {cxx_flags}".strip())
+    else:
+        if c_flags:
+            cmake_args.append(f"-DCMAKE_C_FLAGS={c_flags}")
+        if cxx_flags:
+            cmake_args.append(f"-DCMAKE_CXX_FLAGS={cxx_flags}")
+
     run(
         [
             "cmake",

scripts/ci/sycl_x86_setup.py

@@ -97,21 +97,7 @@ def setup_linux_runtime() -> None:
     run(["sudo", "apt-get", "update"])
     run(["sudo", "apt-get", "install", "-y", "intel-oneapi-runtime-opencl"])
 
-    gcc_shim_dir = Path(require_env("RUNNER_TEMP")) / "gcc-13-shim"
-    gcc_shim_dir.mkdir(parents=True, exist_ok=True)
-    for link_name, target in (
-        ("gcc", "/usr/bin/gcc-13"),
-        ("g++", "/usr/bin/g++-13"),
-        ("cc", "/usr/bin/gcc-13"),
-        ("c++", "/usr/bin/g++-13"),
-    ):
-        link_path = gcc_shim_dir / link_name
-        if link_path.exists() or link_path.is_symlink():
-            link_path.unlink()
-        link_path.symlink_to(target)
-
-    current_path = os.environ.get("PATH", "")
-    write_env("PATH", f"{gcc_shim_dir}:{current_path}" if current_path else str(gcc_shim_dir))
+    write_env("ITLABAI_GCC_INSTALL_DIR", "/usr/lib/gcc/x86_64-linux-gnu/13")
 
     icd_dir = Path(require_env("RUNNER_TEMP")) / "intel-opencl-icd"
     icd_dir.mkdir(parents=True, exist_ok=True)