Skip to content

[CLANG] Created clang.cfg file and cleanup of toolfiles #9897

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
smuzaffar merged 1 commit into from
May 28, 2025
Merged

[CLANG] Created clang.cfg file and cleanup of toolfiles #9897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions llvm.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 1 addition & 4 deletions scram-tools.file/tools/llvm/llvm-ccompiler.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
5 changes: 1 addition & 4 deletions scram-tools.file/tools/llvm/llvm-cxxcompiler.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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@"/>
Expand Down Expand Up @@ -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>