From 93866e2daa6896dc87f4daf7784a16c7888a8af2 Mon Sep 17 00:00:00 2001
From: Shahzad Malik Muzaffar <shahzad.malik.muzaffar@cern.ch>
Date: Wed, 28 May 2025 15:34:59 +0200
Subject: [PATCH] [CLANG] Created clang.cfg file and cleanup of toolfiles

---
 llvm.spec                                        | 8 +++++---
 scram-tools.file/tools/llvm/llvm-ccompiler.xml   | 5 +----
 scram-tools.file/tools/llvm/llvm-cxxcompiler.xml | 5 +----
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/llvm.spec b/llvm.spec
index 4c5fdb062dc..563cc015fd6 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -90,10 +90,12 @@ rm -f %{i}/bin/FileRadar.scpt %{i}/bin/GetRadarVersion.scpt
 # Avoid dependency on /usr/bin/python, Darwin + Xcode specific
 rm -f %{i}/bin/set-xcode-analyzer
 
-#Create clang cfg file for gcc-toolchain
 %if 0%{!?use_system_gcc:1}
-echo "--gcc-toolchain=$GCC_ROOT" > %{i}/bin/clang++.cfg
-echo "--target=$host_triple"    >> %{i}/bin/clang++.cfg
+pushd %{i}/bin
+  echo "--gcc-toolchain=$GCC_ROOT" > clang++.cfg
+  echo "--target=$host_triple"    >> clang++.cfg
+  ln -s clang++.cfg clang.cfg
+popd
 %endif
 
 %post
diff --git a/scram-tools.file/tools/llvm/llvm-ccompiler.xml b/scram-tools.file/tools/llvm/llvm-ccompiler.xml
index 7b11219668c..ec9dcee397e 100644
--- a/scram-tools.file/tools/llvm/llvm-ccompiler.xml
+++ b/scram-tools.file/tools/llvm/llvm-ccompiler.xml
@@ -1,10 +1,7 @@
-  <tool name="llvm-ccompiler" version="@TOOL_VERSION@" type="compiler" revision="1">
+  <tool name="llvm-ccompiler" version="@TOOL_VERSION@" type="compiler" revision="2">
     <use name="gcc-ccompiler"/>
     <client>
       <environment name="LLVM_CCOMPILER_BASE" default="@TOOL_ROOT@"/>
       <environment name="CC" value="$LLVM_CCOMPILER_BASE/bin/clang"/>
     </client>
-%if 0%{!?use_system_gcc:1}
-    <flags CFLAGS="--gcc-toolchain=@GCC_ROOT@"/>
-%endif
   </tool>
diff --git a/scram-tools.file/tools/llvm/llvm-cxxcompiler.xml b/scram-tools.file/tools/llvm/llvm-cxxcompiler.xml
index 3ad30233f57..5fb434b0dc8 100644
--- a/scram-tools.file/tools/llvm/llvm-cxxcompiler.xml
+++ b/scram-tools.file/tools/llvm/llvm-cxxcompiler.xml
@@ -1,4 +1,4 @@
-  <tool name="llvm-cxxcompiler" version="@TOOL_VERSION@" type="compiler" revision="1">
+  <tool name="llvm-cxxcompiler" version="@TOOL_VERSION@" type="compiler" revision="2">
     <use name="gcc-cxxcompiler"/>
     <client>
       <environment name="LLVM_CXXCOMPILER_BASE" default="@TOOL_ROOT@"/>
@@ -33,9 +33,6 @@
     <flags CXXFLAGS="-Wno-tautological-type-limit-compare"/>
     <flags CXXFLAGS="-Wno-vla-cxx-extension"/>
     <flags CXXFLAGS="-fsized-deallocation"/>
-%if 0%{!?use_system_gcc:1}
-    <flags CXXFLAGS="--gcc-toolchain=@GCC_ROOT@"/>
-%endif
     <runtime name="@OS_RUNTIME_LDPATH_NAME@" value="$LLVM_CXXCOMPILER_BASE/lib64" type="path"/>
     <runtime name="PATH" value="$LLVM_CXXCOMPILER_BASE/bin" type="path"/>
   </tool>