Browse Source

Clifford Wolf, Juergen Sawinski:


			
			
				rocklinux
			
			
		
Clifford Wolf 22 years ago
parent
commit
b3e6ee3d2e
2 changed files with 19 additions and 8 deletions
  1. +15
    -7
      package/base/gcc/gcc.conf
  2. +4
    -1
      scripts/Build-Pkg

+ 15
- 7
package/base/gcc/gcc.conf

@ -353,8 +353,8 @@ gcc_cross() {
mkdir objdir ; cd objdir ; hook_eval preconf
eval ../configure --program-prefix=${pkg_gcc_target}- --disable-cpp \
--disable-shared --disable-multilib $confopt
make -C libiberty
if [ -d texinfo ] ; then make -C texinfo ; fi
if [ -d libiberty ]; then make -C libiberty; fi
if [ -d texinfo ]; then make -C texinfo; fi
hook_eval premake
if [ "$xpkg" = "gcc2" ] ; then
@ -364,14 +364,22 @@ gcc_cross() {
else
# workaround for at least gcc-3.2.3
mkdir -p $root/$prefix/lib/${gcc_lib_dir}
make -C gcc all
hook_eval inmake
make -C gcc install
if [ -d gcc ]; then
make -C gcc all
hook_eval inmake
make -C gcc install
else
make all-gcc
hook_eval inmake
make install-gcc
fi
fi
hook_eval postmake
${pkg_gcc_target}-ranlib \
$root/$prefix/lib/${gcc_lib_dir}/libgcc.a
if [ -f $root/$prefix/lib/${gcc_lib_dir}/libgcc.a ]; then
${pkg_gcc_target}-ranlib \
$root/$prefix/lib/${gcc_lib_dir}/libgcc.a
fi
if [ "$stagelevel" -eq 0 ]; then
x="$root/$prefix/crosscc/${arch_target}"

+ 4
- 1
scripts/Build-Pkg

@ -462,7 +462,10 @@ patchfiles="`ls $confdir/*.patch $confdir/*.patch.$arch \
if [ $stagelevel -le 1 ]; then
patchfiles="`ls $patchfiles $confdir/*.patch.cross \
$confdir/*.patch.cross.$arch 2>/dev/null | tr '\n' ' '`"
flistroot="$flistroot include share"
fi
if [ $stagelevel -eq 0 ]; then
flistroot="$flistroot include share doc info man"
flistroot="$flistroot crosscc wrapper $arch_target"
fi
if [ $stagelevel -gt 1 ]; then

Loading…
Cancel
Save