From e1f53c1875e13bac01eb622b8ad1499e707d79c9 Mon Sep 17 00:00:00 2001 From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com> Date: Fri, 19 Jul 2024 14:36:28 +1200 Subject: [PATCH] Makefile: Replace wget with curl --- .github/workflows/extra-builds.yml | 2 +- Makefile | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/extra-builds.yml b/.github/workflows/extra-builds.yml index a7c032d18..b9237d010 100644 --- a/.github/workflows/extra-builds.yml +++ b/.github/workflows/extra-builds.yml @@ -125,7 +125,7 @@ jobs: shell: bash run: | ! make check-git-abc - make wget-abc + make curl-abc - name: Build shell: bash diff --git a/Makefile b/Makefile index 58a07cc85..558660691 100644 --- a/Makefile +++ b/Makefile @@ -791,24 +791,24 @@ check-git-abc: echo "4. Reapply your changes: Move your saved changes back to the 'abc' directory, if necessary."; \ exit 1; \ elif git status 2>&1 | grep 'fatal: not a git repository'; then \ - echo "Did 'yosys' come from a release tarball? Try call 'make wget-abc' to download matching 'abc' tarball."; \ + echo "Did 'yosys' come from a release tarball? Try call 'make curl-abc' to download matching 'abc' tarball."; \ exit 1; \ else \ echo "Initialize the submodule: Run 'git submodule update --init' to set up 'abc' as a submodule."; \ exit 1; \ fi -.PHONY: wget-abc +.PHONY: curl-abc ABC_TAR := abc.tar.gz YOSYS_TAG := $(word 1,$(subst +, ,$(YOSYS_VER))) ABC_TAR_URL := https://github.com/YosysHQ/yosys/releases/download/yosys-$(YOSYS_TAG)/$(ABC_TAR) -wget-abc: +curl-abc: @if [ -z "$$(find abc -type d -prune -empty 2>&1)" ]; then \ echo "Error: The 'abc' directory already has contents. Clear 'abc' directory before continuing."; \ exit 1; \ else \ mkdir -p abc; \ - wget -nc "$(ABC_TAR_URL)"; \ + curl -O -J -L "$(ABC_TAR_URL)"; \ echo "Extracting '$(ABC_TAR)' contents."; \ tar xzf $(ABC_TAR) -C abc --strip-components=1; \ fi