diff --git a/BaseBuild/Basesys/binutils b/BaseBuild/Basesys/binutils index 5752c06..b11e867 100644 --- a/BaseBuild/Basesys/binutils +++ b/BaseBuild/Basesys/binutils @@ -70,30 +70,22 @@ # SRCPATH=Base/Utilities -(( MKPKG = $MKPKG | 1 )) -(( MKPKG = $MKPKG | 2 )) -(( MKPKG = $MKPKG | 128 )) 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() { - if [ "$MK64BIT" == "true" ]; then - ADDCONFIGURE="--libdir=/usr/lib64" - fi CC="gcc -isystem /usr/include ${BUILDOPTIONS}" \ LDFLAGS="-Wl,-rpath-link,/lib64:/lib ${BUILDOPTIONS}" \ ../binutils*/configure --prefix=/usr \ - $ADDCONFIGURE \ - --enable-shared \ - --enable-64-bit-bfd + --libdir=/usr/${LIBDIR} \ + --enable-shared \ + --enable-64-bit-bfd make -j $NUMCPU configure-host make -j $NUMCPU tooldir=/usr - MakeCheck check + MakeCheck -j $NUMCPU check make -j $NUMCPU tooldir=/usr DESTDIR=$TMPROOT install }