From fef9ad520bbf7b9666c6ddaf80d926624f253658 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira=20Rolim?= <34201958+ericonr@users.noreply.github.com> Date: Thu, 18 Jun 2020 11:31:12 -0300 Subject: [PATCH] Toolchain: Use curl instead of wget (#2574) - For Linux: curl is already listed as a dependency; - For macOS: curl is pre-installed; - For OpenBSD and FreeBSD: curl is a dependecy of git. --- Documentation/BuildInstructions.md | 1 - Toolchain/BuildIt.sh | 4 ++-- Toolchain/BuildIt_x86_64.sh | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Documentation/BuildInstructions.md b/Documentation/BuildInstructions.md index 61d91bea09..fb91e51c07 100644 --- a/Documentation/BuildInstructions.md +++ b/Documentation/BuildInstructions.md @@ -36,7 +36,6 @@ brew install coreutils brew tap discoteq/discoteq brew install flock brew install qemu -brew install wget brew install e2fsprogs brew install m4 brew install autoconf diff --git a/Toolchain/BuildIt.sh b/Toolchain/BuildIt.sh index be1380232e..57098f3a70 100755 --- a/Toolchain/BuildIt.sh +++ b/Toolchain/BuildIt.sh @@ -117,7 +117,7 @@ pushd "$DIR/Tarballs" echo "bu md5='$md5'" if [ ! -e $BINUTILS_PKG ] || [ "$md5" != ${BINUTILS_MD5SUM} ] ; then rm -f $BINUTILS_PKG - wget "$BINUTILS_BASE_URL/$BINUTILS_PKG" + curl -LO "$BINUTILS_BASE_URL/$BINUTILS_PKG" else echo "Skipped downloading binutils" fi @@ -126,7 +126,7 @@ pushd "$DIR/Tarballs" echo "gc md5='$md5'" if [ ! -e $GCC_PKG ] || [ "$md5" != ${GCC_MD5SUM} ] ; then rm -f $GCC_PKG - wget "$GCC_BASE_URL/$GCC_NAME/$GCC_PKG" + curl -LO "$GCC_BASE_URL/$GCC_NAME/$GCC_PKG" else echo "Skipped downloading gcc" fi diff --git a/Toolchain/BuildIt_x86_64.sh b/Toolchain/BuildIt_x86_64.sh index 087181a8ed..abdf22ce3a 100755 --- a/Toolchain/BuildIt_x86_64.sh +++ b/Toolchain/BuildIt_x86_64.sh @@ -52,7 +52,7 @@ pushd "$DIR/Tarballs" echo "bu md5='$md5'" if [ ! -e $BINUTILS_PKG ] || [ "$md5" != ${BINUTILS_MD5SUM} ] ; then rm -f $BINUTILS_PKG - wget "$BINUTILS_BASE_URL/$BINUTILS_PKG" + curl -LO "$BINUTILS_BASE_URL/$BINUTILS_PKG" else echo "Skipped downloading binutils" fi @@ -61,7 +61,7 @@ pushd "$DIR/Tarballs" echo "gc md5='$md5'" if [ ! -e $GCC_PKG ] || [ "$md5" != ${GCC_MD5SUM} ] ; then rm -f $GCC_PKG - wget "$GCC_BASE_URL/$GCC_NAME/$GCC_PKG" + curl -LO "$GCC_BASE_URL/$GCC_NAME/$GCC_PKG" else echo "Skipped downloading gcc" fi