Makefile: detected TINYGO now works even if a rule changes directory

tinygo-org · Jan 20, 2022 · 6966c6e · 6966c6e
1 parent e9d182c
commit 6966c6e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -36,7 +36,7 @@ GOTESTFLAGS ?= -v
 MD5SUM = md5sum
 
 # tinygo binary for tests
-TINYGO ?= $(call detect,tinygo,tinygo build/tinygo)
+TINYGO ?= $(call detect,tinygo,tinygo $(PWD)/build/tinygo)
 
 # Use CCACHE for LLVM if possible
 ifneq (, $(shell command -v ccache 2> /dev/null))