This commit is contained in:
Daniel
2018-10-12 07:20:43 +02:00
committed by GitHub
parent 04f46f874d
commit 22e95b4eef
2 changed files with 27 additions and 23 deletions
+6 -11
View File
@@ -33,6 +33,7 @@ if ! (
make -C build-binutils -j${nproc} install
)
then
echo "STAGE=${TARGET}" > .error
exit 1
fi
@@ -57,25 +58,19 @@ fi
if ! (
(cd gcc-*; contrib/download_prerequisites)
mkdir -pv build-gcc
(cd build-gcc; ../gcc-*/configure --target="${TARGET}" --prefix="${PREFIX}" --disable-lto --disable-nls --disable-werror --enable-languages=all --enable-multilib --enable-multiarch --with-pkgversion="*DANiO* T00LCHAIN" --with-system-zlib --enable-obsolete --with-newlib --with-headers="../newlib-*/newlib/libc/include")
(cd build-gcc; ../gcc-*/configure --target="${TARGET}" --prefix="${PREFIX}" --disable-lto --disable-nls --disable-werror --enable-languages=all --with-pkgversion="*DANiO* T00LCHAIN" --with-system-zlib --enable-obsolete --with-newlib --with-headers="../newlib-*/newlib/libc/include" --without-libssp )#--enable-multilib --enable-multiarch
)
then
echo "STAGE=${TARGET}" > .error
exit 1
fi
maybe_try_this()
{
make -C build-gcc all-gcc -j${nproc} || return 1
make -C build-gcc all-target-libgcc -j${nproc} || return 1
make -C build-gcc install-gcc -j${nproc} || return 1
make -C build-gcc install-target-libgcc -j${nproc} || return 1
}
if ! (
make -C build-gcc -j${nproc} || maybe_try_this
make -C build-gcc install -j${nproc} || maybe_try_this
make -C build-gcc -j${nproc}
make -C build-gcc install -j${nproc}
)
then
echo "STAGE=${TARGET}" > .error
exit 1
fi
+21 -12
View File
@@ -1,5 +1,7 @@
#!/bin/sh
build()
{
sudo apt update -qq
sudo apt install -y git-core gnupg flex bison lftp gperf build-essential zip curl zlib1g-dev gcc-multilib g++-multilib libc6-dev-i386 lib32ncurses5-dev libx11-dev lib32z-dev libxml2-utils xsltproc schedtool gettext nodejs npm
sudo npm config set strict-ssl false
@@ -11,14 +13,7 @@ for i in aarch64-${TUPLE}-linux alpha-${TUPLE}-linux arm-${TUPLE}-eabi arc-${TUP
. ./.error
break
else
case ${1} in
64)
export CC="cc -m64"
export CXX="c++ -m64" ;;
32)
export CC="cc -m32"
export CXX="c++ -m32" ;;
esac
sudo rm -rf binutils-* build-* LATEST-* gcc-* newlib-*
sudo ./danio_gcc.sh ${i} | tee out/${i}.log
fi
@@ -27,7 +22,21 @@ if [ -e .error ]; then
echo "error detected @ ${STAGE} !"
exit 1
fi
if [ "${2}" == "upload" ]; then
echo "gcc.danio.ga" >out/CNAME
surge ./out gcc.danio.ga
fi
}
mkdir -p out
case ${1} in
64)
export CC="cc -m64"
export CXX="c++ -m64"
build ;;
32)
export CC="cc -m32"
export CXX="c++ -m32"
build ;;
--build-upload) ${0} 64 && ${0} 32 && surge ./out gcc.danio.ga ;;
--build) ${0} 64 && ${0} 32 ;;
esac
exit ${?}