Browse Source

Clifford Wolf:


			
			
				rocklinux
			
			
		
Clifford Wolf 20 years ago
parent
commit
875d4bcee1
2 changed files with 8 additions and 8 deletions
  1. +4
    -4
      package/base/gcc/config-300.in
  2. +4
    -4
      package/base/gcc/gcc.conf

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

@ -81,28 +81,28 @@ then
comment ' '
comment '--- GCC 2.x options'
bool 'Do not build CHILL compiler' \
ROCKCFG_PKG_GCC2_NO_CHILL 0
ROCKCFG_PKG_GCC2_NO_CHILL 1
%include package/*/*/subconfig-gcc2.in
fi
if pkgcheck gcc=gcc32 X; then
comment ' '
comment '--- GCC 3.2.x options'
bool 'Do not build JAVA compiler' \
ROCKCFG_PKG_GCC32_NO_JAVA 0
ROCKCFG_PKG_GCC32_NO_JAVA 1
%include package/*/*/subconfig-gcc32.in
fi
if pkgcheck gcc=gcc33 X; then
comment ' '
comment '--- GCC 3.3.x options'
bool 'Do not build JAVA compiler' \
ROCKCFG_PKG_GCC33_NO_JAVA 0
ROCKCFG_PKG_GCC33_NO_JAVA 1
%include package/*/*/subconfig-gcc33.in
fi
if pkgcheck gcc=gcc34 X; then
comment ' '
comment '--- GCC 3.4.x options'
bool 'Do not build JAVA compiler' \
ROCKCFG_PKG_GCC34_NO_JAVA 0
ROCKCFG_PKG_GCC34_NO_JAVA 1
bool 'Do profiled bootstrap' \
ROCKCFG_PKG_GCC34_PROFILED 1
%include package/*/*/subconfig-gcc34.in

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

@ -203,15 +203,15 @@ custmain() {
fi
else
if [ $xpkg = gcc2 -a "$ROCKCFG_PKG_GCC2_NO_CHILL" = 1 ] ; then
if [ $xpkg = gcc2 -a "$ROCKCFG_PKG_GCC2_NO_CHILL" != 0 ] ; then
# gcc-2.x contains no java compiler
confopt="$confopt --enable-languages=c,c++,objc,f77"
elif [ "$ROCKCFG_DIETLIBC_ALL" = 1 -o "$ROCKCFG_DIETLIBC_gcc3" = 1 ] ; then
# FIXME: c++ and java are not working with dietlibc
confopt="$confopt --enable-languages=c,objc"
elif [ $xpkg = gcc32 -a "$ROCKCFG_PKG_GCC32_NO_JAVA" = 1 ] || \
[ $xpkg = gcc33 -a "$ROCKCFG_PKG_GCC33_NO_JAVA" = 1 ] || \
[ $xpkg = gcc34 -a "$ROCKCFG_PKG_GCC34_NO_JAVA" = 1 ]; then
elif [ $xpkg = gcc32 -a "$ROCKCFG_PKG_GCC32_NO_JAVA" != 0 ] || \
[ $xpkg = gcc33 -a "$ROCKCFG_PKG_GCC33_NO_JAVA" != 0 ] || \
[ $xpkg = gcc34 -a "$ROCKCFG_PKG_GCC34_NO_JAVA" != 0 ]; then
# gcc-3.x contains no chill compiler
confopt="$confopt --enable-languages=c,c++,objc,f77"
elif [ "$arch" = mips ] ; then

Loading…
Cancel
Save