From f4fdf8dce990058adff06b85819bc41b9038a0b1 Mon Sep 17 00:00:00 2001 From: Dan Kegel Date: Thu, 20 Jan 2022 14:15:42 -0800 Subject: [PATCH] Makefile: detected TINYGO now works even if a rule changes directory --- .github/workflows/build-macos.yml | 2 +- .github/workflows/windows.yml | 2 +- Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml index 7a57e260..ebf56838 100644 --- a/.github/workflows/build-macos.yml +++ b/.github/workflows/build-macos.yml @@ -92,4 +92,4 @@ jobs: path: build/tinygo.darwin-amd64.tar.gz - name: Smoke tests shell: bash - run: make smoketest TINYGO=build/tinygo AVR=0 + run: make smoketest TINYGO=$(PWD)/build/tinygo AVR=0 diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 2039269a..1c3f3bcf 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -92,6 +92,6 @@ jobs: path: build/release/release.zip - name: Smoke tests shell: bash - run: make smoketest TINYGO=build/tinygo AVR=0 XTENSA=0 + run: make smoketest TINYGO=$(PWD)/build/tinygo AVR=0 XTENSA=0 - name: Test stdlib packages run: make tinygo-test diff --git a/Makefile b/Makefile index 0fc07451..88e0df34 100644 --- a/Makefile +++ b/Makefile @@ -36,7 +36,7 @@ GOTESTFLAGS ?= -v MD5SUM = md5sum # tinygo binary for tests -TINYGO ?= $(call detect,tinygo,tinygo build/tinygo) +TINYGO ?= $(call detect,tinygo,tinygo $(CURDIR)/build/tinygo) # Use CCACHE for LLVM if possible ifneq (, $(shell command -v ccache 2> /dev/null))