-export CFLAGS="-pipe -march=${MACHINE_ARCHITECTURE} -O2"
-export CXXFLAGS=${CFLAGS}
-
-ipkg ${KERNEL} cis-kernel
-ipkg ${MANPAGES} cis-man-pages
-ipkg ${GLIBC} cis-glibc
-run_script_log "toolchain-adjust-stage2" cis-toolchain-adjust
-ipkg ${BINUTILS} cis-binutils
-ipkg ${GCC_CORE} cis-gcc
-ipkg ${DB4} cis-db4
-ipkg_ac ${SED} "--bindir=/bin --enable-html"
-ipkg ${E2FSPROGS} cis-e2fsprogs
-ipkg ${COREUTILS} cis-coreutils
-ipkg ${IANA} cis-iana
-ipkg_ac ${MFOUR}
-ipkg ${BISON} cis-bison
-ipkg ${NCURSES} cis-ncurses
-ipkg ${PROCPS} cis-procps
-ipkg_ac ${LIBTOOL}
-ipkg ${PERL} cis-perl
-ipkg ${READLINE} cis-readline
-ipkg ${ZLIB} cis-zlib
-ipkg_ac ${AUTOCONF}
-ipkg_ac ${AUTOMAKE}
-ipkg_ac ${BASH} "--bindir=/bin --without-bash-malloc --with-installed-readline"
+ipkg -l "${PERL}-pass1" ${PERL}
+ipkg -m noac ${KERNEL}
+ipkg -m noac ${MANPAGES}
+ipkg ${EGLIBC}
+rscr once "Adjusting toolchain" toolchain-adjust
+rscr mult "Testing toolchain" toolchain-test
+
+export CC="gcc -isystem /usr/include"
+export CXX="g++ -isystem /usr/include"
+export LDFLAGS="-Wl,-rpath-link,/lib"
+
+CPPFLAGS=-fexceptions \
+ ipkg ${GMP} "--enable-cxx --enable-mpbsd"
+ipkg ${MPFR} "--enable-shared --with-gmp=/usr"
+ipkg ${MPC}
+CPPFLAGS=-fexceptions \
+ ipkg ${PPL} "--enable-shared --disable-optimization"
+ipkg ${CLOOG_PPL} "--enable-shared --with-gmp --with-ppl"
+
+unset CC
+unset CXX
+unset LDFLAGS
+
+ipkg -m acnb ${ZLIB}
+ipkg ${BINUTILS}
+ipkg ${GCC}
+rscr mult "Testing toolchain" toolchain-test
+ipkg ${SED} "--bindir=/bin"
+ipkg ${PKG_CONFIG}
+ipkg ${NCURSES}
+ipkg ${UTIL_LINUX_NG}
+ipkg ${E2FSPROGS}
+ipkg ${COREUTILS}
+ipkg -m noac ${IANA}
+ipkg ${MFOUR}
+ipkg ${BISON}
+ipkg -m noac ${PROCPS}
+ipkg ${LIBTOOL}
+ipkg ${FLEX}
+ipkg -m noac ${IPROUTE2}
+ipkg -l "${PERL}-pass2" ${PERL}
+ipkg ${READLINE}
+ipkg ${AUTOCONF}
+ipkg ${AUTOMAKE}
+ipkg ${BASH} "--bindir=/bin --without-bash-malloc --with-installed-readline"