diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template index 2ca229ae8f0..c595a24db57 100644 --- a/srcpkgs/gcc/template +++ b/srcpkgs/gcc/template @@ -47,9 +47,25 @@ Add_dependency build cloog-ppl-devel Add_dependency build libelf-devel Add_dependency build binutils +if [ -n "$BOOTSTRAP_PKG_REBUILD" ]; then + Add_dependency build coreutils + Add_dependency build gawk + Add_dependency build sed + Add_dependency build texinfo + Add_dependency build gettext +fi do_build() { + local BPATH + + if [ -n "$BOOTSTRAP_PKG_REBUILD" ]; then + BPATH="/usr/local/sbin:/bin:/usr/bin:/sbin:/usr/sbin" + BPATH="$BPATH:/usr/local/bin:/tools/bin" + else + BPATH=$PATH + fi + # As specified in the LFS book, disable installing libiberty. sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in # "Add" ppl-0.11 compatibility @@ -57,7 +73,7 @@ do_build() # Do not run fixincludes sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in - ./configure --prefix=/usr \ + PATH=$BPATH ./configure --prefix=/usr \ --enable-clocale=gnu --disable-bootstrap \ --enable-threads=posix --enable-__cxa_atexit --disable-multilib \ --enable-languages=c,c++,objc,obj-c++,fortran,go,lto --enable-tls \