Skip to content

Commit f4fdf8d

Browse files
dkegel-fastlydeadprogram
authored andcommitted
Makefile: detected TINYGO now works even if a rule changes directory
1 parent 9c3f953 commit f4fdf8d

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

.github/workflows/build-macos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,4 +92,4 @@ jobs:
9292
path: build/tinygo.darwin-amd64.tar.gz
9393
- name: Smoke tests
9494
shell: bash
95-
run: make smoketest TINYGO=build/tinygo AVR=0
95+
run: make smoketest TINYGO=$(PWD)/build/tinygo AVR=0

.github/workflows/windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,6 @@ jobs:
9292
path: build/release/release.zip
9393
- name: Smoke tests
9494
shell: bash
95-
run: make smoketest TINYGO=build/tinygo AVR=0 XTENSA=0
95+
run: make smoketest TINYGO=$(PWD)/build/tinygo AVR=0 XTENSA=0
9696
- name: Test stdlib packages
9797
run: make tinygo-test

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ GOTESTFLAGS ?= -v
3636
MD5SUM = md5sum
3737

3838
# tinygo binary for tests
39-
TINYGO ?= $(call detect,tinygo,tinygo build/tinygo)
39+
TINYGO ?= $(call detect,tinygo,tinygo $(CURDIR)/build/tinygo)
4040

4141
# Use CCACHE for LLVM if possible
4242
ifneq (, $(shell command -v ccache 2> /dev/null))

0 commit comments

Comments
 (0)