Browse Source

Stefan Fiedler:


			
			
				rocklinux
			
			
		
Stefan Fiedler 19 years ago
parent
commit
c8765be115
2 changed files with 3 additions and 3 deletions
  1. +2
    -2
      package/base/gcc/config-300.in
  2. +1
    -1
      package/base/gcc/gcc.conf

+ 2
- 2
package/base/gcc/config-300.in

@ -69,10 +69,10 @@ then
choice ROCKCFG_DEFAULT_F77 $d $k
# build non-default CCs in stages 5 and 9
# and a dedicated C++ compiler in stages 2 and 9
# and dedicated C++ and Fortran77 compilers in stages 2 and 9
k=""; for x in gcc2 gcc32 gcc33 gcc34 gcc40 gcc41; do
if [ "$ROCKCFG_DEFAULT_CC" != "$x" ] ; then
if [ "$ROCKCFG_DEFAULT_CXX" != "$x" ]; then
if [[ "$ROCKCFG_DEFAULT_CXX" != "$x" && "$ROCKCFG_DEFAULT_F77" != "$x" ]]; then
k="$k / gcc=$x / { s/^\(.\) [0-9-]*/\1 -----5---9/; s/ CORE //g; };"
else
k="$k / gcc=$x / s/^\(.\) [0-9-]*/\1 --2------9/;"

+ 1
- 1
package/base/gcc/gcc.conf

@ -272,7 +272,7 @@ custmain() {
# Rename and install binaries
#
cd $builddir/inst_bin ; mkdir -p $root/$prefix/bin
for y in c++ c++filt g++ cpp f77 g77 gcc gcov ; do
for y in c++ c++filt g++ cpp f77 g77 gfortran gcc gcov ; do
for x in $y ${pkg_gcc_target}-$y ; do
if [ -f "$x" ] ; then
mv -v $x $root/$prefix/bin/${x}-${pkg_gcc_version}

|||||||
100:0
Loading…
Cancel
Save