diff --git a/BaseBuild/crosschain/binutils b/BaseBuild/crosschain/binutils index b6dbf77..891dcbe 100644 --- a/BaseBuild/crosschain/binutils +++ b/BaseBuild/crosschain/binutils @@ -78,8 +78,6 @@ premk() { SrcPatch $MAKEDIR/binutils* $LFSSOURCE/$SRCPATH/binutils-*-posix*.patch* SrcPatch $MAKEDIR/binutils* $LFSSOURCE/$SRCPATH/binutils-*-branch_update-*.patch* SrcPatch $MAKEDIR/binutils* $LFSSOURCE/$SRCPATH/binutils-*-genscripts_multilib-*.patch* - mkdir ../build-binutils - cd ../build-binutils } mk() { @@ -100,6 +98,5 @@ mk() { } postmk() { - cd ../binutils* - rm -r ../build-binutils + echo "Nothing to do for postmk()" } diff --git a/BaseBuild/crosschain/gcc b/BaseBuild/crosschain/gcc index a01f72d..48972d4 100644 --- a/BaseBuild/crosschain/gcc +++ b/BaseBuild/crosschain/gcc @@ -101,6 +101,9 @@ premk() { if [ ! -f /tmp/crossgcc_stage1 ]; then touch /tools/include/limits.h fi + if [ ! -f /lib/cpp ]; then + ln -sf ../usr/bin/cpp /lib/cpp + fi mkdir ../build-gcc cd ../build-gcc } diff --git a/BaseBuild/crosschain/glibc b/BaseBuild/crosschain/glibc index 1ba26d3..aeed069 100644 --- a/BaseBuild/crosschain/glibc +++ b/BaseBuild/crosschain/glibc @@ -100,8 +100,10 @@ mk32() { --with-binutils=/cross-tools/bin \ --with-headers=/tools/include \ --cache-file=config.cache + sed -i "s/\(^MAKEINFO = makeinfo\)/\1 --force/" config.make make -j $NUMCPU make -j $NUMCPU install + make install cd ../glibc* rm -r ../build-glibc/ mkdir ../build-glibc @@ -136,8 +138,10 @@ mk() { --with-binutils=/cross-tools/bin \ --with-headers=/tools/include \ --cache-file=config.cache + sed -i "s/\(^MAKEINFO = makeinfo\)/\1 --force/" config.make make -j $NUMCPU make -j $NUMCPU install + make install } postmk() { diff --git a/BaseBuild/toolchain/binutils b/BaseBuild/toolchain/binutils index 0b1f3ab..85ab73a 100644 --- a/BaseBuild/toolchain/binutils +++ b/BaseBuild/toolchain/binutils @@ -90,8 +90,6 @@ premk() { SrcPatch $MAKEDIR/binutils* $LFSSOURCE/$SRCPATH/binutils-*-branch_update-*.patch* SrcPatch $MAKEDIR/binutils* $LFSSOURCE/$SRCPATH/binutils-*-genscripts_multilib-*.patch* - mkdir ../build-binutils - cd ../build-binutils } mk() { @@ -116,6 +114,5 @@ mk() { } postmk() { - cd ../binutils* - rm -r ../build-binutils + echo "Nothing to do for premk()" } diff --git a/BaseBuild/toolchain/zlib b/BaseBuild/toolchain/zlib index 893e37e..d8aebff 100644 --- a/BaseBuild/toolchain/zlib +++ b/BaseBuild/toolchain/zlib @@ -85,9 +85,7 @@ SRCPATH=Base/Lib (( MKPKG = $MKPKG | 8 )) (( MKPKG = $MKPKG | 16 )) -if [ "$MK64BIT" == "true" ]; then - (( MKPKG = $MKPKG | 128 )) -fi +(( MKPKG = $MKPKG | 128 )) premk() { echo "nothing to do for premk()"