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.4 by eulisse, Wed Jan 26 11:23:18 2011 UTC vs.
Revision 1.7 by eulisse, Thu Apr 7 11:43:01 2011 UTC

# Line 65 | Line 65 | cat << \EOF_TOOLFILE >%i/etc/scram.d/cxx
65      <flags CPPFLAGS="-I@GCC_ROOT@/include/c++/@GCC_REALVERSION@"/>
66      <flags CPPFLAGS="-I@GCC_ROOT@/include/c++/@GCC_REALVERSION@/@GCC_ARCH@"/>
67      <flags CPPFLAGS="-I@GCC_ROOT@/include/c++/@GCC_REALVERSION@/backward"/>
68 <    <flags CXXFLAGS="-O2 -pedantic -ansi -pthread -pipe"/>
68 >    <flags CXXFLAGS="-O2 -ansi -pthread -pipe"/>
69      <flags CXXFLAGS="@ARCH_CXXFLAGS@ @COMPILER_CXXFLAGS@"/>
70      <flags CXXFLAGS="-fmessage-length=0 -ftemplate-depth-300"/>
71      # -Wno-non-template-friend removed since it's not supported, yet, by llvm.
# Line 79 | Line 79 | cat << \EOF_TOOLFILE >%i/etc/scram.d/cxx
79      <runtime name="PATH" value="$CXXCOMPILER_BASE/bin" type="path"/>
80      <runtime name="@OS_RUNTIME_LDPATH_NAME@" value="@GCC_ROOT@/@ARCH_LIB64DIR@" type="path"/>
81      <runtime name="@OS_RUNTIME_LDPATH_NAME@" value="@GCC_ROOT@/lib" type="path"/>
82 +    <runtime name="COMPILER_RUNTIME_OBJECTS" value="@GCC_ROOT@/lib/gcc/@GCC_ARCH@/@GCC_REALVERSION@"/>
83      <runtime name="PATH" value="@GCC_ROOT@/bin" type="path"/>
84    </tool>
85   EOF_TOOLFILE
# Line 187 | Line 188 | esac
188   COMPILER_CXXFLAGS=
189   case %cmsplatf in
190     *_gcc4[56789]* )
191 <     COMPILER_CXXFLAGS="$COMPILER_CXXFLAGS -std=c++0x -ftree-vectorize"
191 >     COMPILER_CXXFLAGS="$COMPILER_CXXFLAGS"
192       F77_MMD="-cpp -MMD"
193     ;;
194   esac

Diff Legend

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