Skip to content

Commit

Permalink
Merge pull request #9321 from cms-sw/fix-tool-format
Browse files Browse the repository at this point in the history
fix gcc-tools format
  • Loading branch information
smuzaffar authored Jul 25, 2024
2 parents c595cef + a68e224 commit 0d64e9e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions scram-tools.file/tools/gcc/gcc-cxxcompiler.xml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<tool name="gcc-cxxcompiler" version="@TOOL_VERSION@" type="compiler">
<client>
<environment name="GCC_CXXCOMPILER_BASE" default="@TOOL_ROOT@"/>
<environment name="GCC_CXXCOMPILER_BASE" default="@TOOL_ROOT@"/>
%if 0%{!?use_system_gcc:1}
<environment name="CXX" value="$GCC_CXXCOMPILER_BASE/bin/c++@COMPILER_NAME_SUFFIX@"/>
<environment name="CXX" value="$GCC_CXXCOMPILER_BASE/bin/c++@COMPILER_NAME_SUFFIX@"/>
%else
<environment name="CXX" value="c++@COMPILER_NAME_SUFFIX@"/>
<environment name="CXX" value="c++@COMPILER_NAME_SUFFIX@"/>
%endif
</client>
<flags CPPDEFINES="GNU_GCC _GNU_SOURCE @GCC_CPPDEFINES@"/>
Expand Down
6 changes: 3 additions & 3 deletions scram-tools.file/tools/gcc/gcc-f77compiler.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
<lib name="gfortran"/>
<lib name="m"/>
<client>
<environment name="GCC_F77COMPILER_BASE" default="@TOOL_ROOT@"/>
<environment name="GCC_F77COMPILER_BASE" default="@TOOL_ROOT@"/>
%if 0%{!?use_system_gcc:1}
<environment name="FC" default="$GCC_F77COMPILER_BASE/bin/gfortran"/>
<environment name="FC" default="$GCC_F77COMPILER_BASE/bin/gfortran"/>
%else
<environment name="FC" default="gfortran"/>
<environment name="FC" default="gfortran"/>
%endif
</client>
<flags FFLAGS="-fno-second-underscore -Wunused -Wuninitialized -O3 @GCC_FFLAGS@"/>
Expand Down

0 comments on commit 0d64e9e

Please sign in to comment.