ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/COMP/CMSDIST/llvm-gcc-toolfile.spec
(Generate patch)

Comparing COMP/CMSDIST/llvm-gcc-toolfile.spec (file contents):
Revision 1.6 by eulisse, Wed Mar 30 12:19:05 2011 UTC vs.
Revision 1.8 by eulisse, Wed Apr 20 13:36:12 2011 UTC

# Line 36 | Line 36 | else
36      export GCC_VERSION
37      export G77_ROOT=$GCC_ROOT
38   fi
39 –
39   export GCC_REALVERSION=`echo $GCC_VERSION | sed -e's|-.*||'`
40   export COMPILER_VERSION=`echo $LLVM_VERSION`
41   export COMPILER_VERSION_MAJOR=`echo $LLVM_VERSION | sed -e 's|\([0-9]\).*|\1|'`
# Line 69 | Line 68 | cat << \EOF_TOOLFILE >%i/etc/scram.d/cxx
68      <flags CXXFLAGS="@ARCH_CXXFLAGS@ @COMPILER_CXXFLAGS@"/>
69      <flags CXXFLAGS="-fmessage-length=0 -ftemplate-depth-300"/>
70      # -Wno-non-template-friend removed since it's not supported, yet, by llvm.
71 <    <flags CXXFLAGS="-Wall -Wno-long-long -Wimplicit -Wreturn-type -Wunused -Wparentheses -Wsign-compare -Wno-deprecated -Werror=return-type -Werror=missing-braces -Werror=unused-value -Werror=address -Werror=format -Werror=write-strings -Werror=strict-overflow -fdiagnostics-show-option"/>
72 <    <flags LDFLAGS="@OS_LDFLAGS@"/>
71 >    <flags CXXFLAGS="-Wall -Wno-long-long -Wimplicit -Wreturn-type -Wunused -Wsign-compare -Wno-deprecated -Werror=return-type -Werror=missing-braces -Werror=unused-value -Werror=address -Werror=format -Werror=write-strings -Werror=strict-overflow -fdiagnostics-show-option"/>
72 >    <flags LDFLAGS="@OS_LDFLAGS@ -L@GCC_ROOT@/lib64"/>
73      <flags CXXSHAREDFLAGS="@OS_SHAREDFLAGS@ @ARCH_SHAREDFLAGS@"/>
74      <flags SHAREDSUFFIX="@OS_SHAREDSUFFIX@"/>
75      <flags LD_UNIT="@OS_LD_UNIT@ @ARCH_LD_UNIT@"/>
# Line 95 | Line 94 | cat << \EOF_TOOLFILE >%i/etc/scram.d/cco
94      <flags CSHAREDOBJECTFLAGS="-fPIC"/>
95      <flags CFLAGS="-pthread"/>
96      <flags CFLAGS="-O2"/>
97 <    <flags LDFLAGS="@OS_LDFLAGS@"/>
97 >    <flags LDFLAGS="@OS_LDFLAGS@ -L@GCC_ROOT@/lib64"/>
98      <flags CSHAREDFLAGS="@OS_SHAREDFLAGS@ @ARCH_SHAREDFLAGS@"/>
99      <flags SCRAM_COMPILER_NAME="clangc@COMPILER_VERSION@"/>
100      <flags SCRAM_LANGUAGE_TYPE="C"/>
# Line 188 | Line 187 | esac
187   COMPILER_CXXFLAGS=
188   case %cmsplatf in
189     *_gcc4[56789]* )
190 <     COMPILER_CXXFLAGS="$COMPILER_CXXFLAGS -std=c++0x -ftree-vectorize"
190 >     COMPILER_CXXFLAGS="$COMPILER_CXXFLAGS"
191       F77_MMD="-cpp -MMD"
192     ;;
193   esac

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines