ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

root/cvsroot/COMP/CMSDIST/llvm-gcc-toolfile.spec

Comparing COMP/CMSDIST/llvm-gcc-toolfile.spec (file contents):
Revision 1.2 by eulisse, Mon Jan 24 16:01:07 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 65 | Line 64 | cat << \EOF_TOOLFILE >%i/etc/scram.d/cxx
64		<flags CPPFLAGS="-I@GCC_ROOT@/include/c++/@GCC_REALVERSION@"/>
65		<flags CPPFLAGS="-I@GCC_ROOT@/include/c++/@GCC_REALVERSION@/@GCC_ARCH@"/>
66		<flags CPPFLAGS="-I@GCC_ROOT@/include/c++/@GCC_REALVERSION@/backward"/>
67	<	<flags CXXFLAGS="-O2 -pedantic -ansi -pthread -pipe"/>
67	>	<flags CXXFLAGS="-O2 -ansi -pthread -pipe"/>
68		<flags CXXFLAGS="@ARCH_CXXFLAGS@ @COMPILER_CXXFLAGS@"/>
69	<	<flags CXXFLAGS="-felide-constructors -fmessage-length=0 -ftemplate-depth-300"/>
70	<	<flags CXXFLAGS="-Wunknown-warning-option -Wall -Wno-non-template-friend -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"/>
71	<	<flags LDFLAGS="@OS_LDFLAGS@"/>
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 -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 78 | Line 78 | cat << \EOF_TOOLFILE >%i/etc/scram.d/cxx
78		<runtime name="PATH" value="$CXXCOMPILER_BASE/bin" type="path"/>
79		<runtime name="@OS_RUNTIME_LDPATH_NAME@" value="@GCC_ROOT@/@ARCH_LIB64DIR@" type="path"/>
80		<runtime name="@OS_RUNTIME_LDPATH_NAME@" value="@GCC_ROOT@/lib" type="path"/>
81	+	<runtime name="COMPILER_RUNTIME_OBJECTS" value="@GCC_ROOT@/lib/gcc/@GCC_ARCH@/@GCC_REALVERSION@"/>
82		<runtime name="PATH" value="@GCC_ROOT@/bin" type="path"/>
83		</tool>
84		EOF_TOOLFILE
#	Line 93 | 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 186 | 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
#	Line 224 | Line 225 | esac
225		perl -p -i -e 's|\@([^@]*)\@|$ENV{$1}|g' %i/etc/scram.d/*.xml
226
227		%post
228	<	[ "X$RPM_INSTALL_PREFIX" == "X$CMS_INSTALL_PREFIX" ] || perl -p -i -e "s|$RPM_INSTALL_PREFIX|$CMS_INSTALL_PREFIX|g" $RPM_INSTALL_PREFIX/%{pkgrel}/etc/scram.d/*.xml
228	>	%{relocateConfig}etc/scram.d/*.xml
229		echo "LLVM_GCC_TOOLFILE_ROOT='$CMS_INSTALL_PREFIX/%{pkgrel}'; export GCC_TOOLFILE_ROOT" > $RPM_INSTALL_PREFIX/%{pkgrel}/etc/profile.d/init.sh
230		echo "setenv LLVM_GCC_TOOLFILE_ROOT '$CMS_INSTALL_PREFIX/%{pkgrel}'" > $RPM_INSTALL_PREFIX/%{pkgrel}/etc/profile.d/init.csh

Diff Legend

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