Skip to content

Commit a42f02f

Browse files
committed
Fix calling asdf from make
Make sets various env variables to communicate with itself in cases of recursive make files. Notably the `MAKELEVEL` defines the number of nested `make` calls currently active. This can cause errors when calling an unrelated make job from within an outer makefile. Since `asdf` builds some software from source (using make) we need to isolate the asdf issued make calls from the outer. This is done by unsetting the `MAKELEVEL` variable before calling asdf.
1 parent 19a562d commit a42f02f

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

.dockerignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@ contracts/node_modules
33
contracts/deployments
44
docker/data
55
play/work
6+
play/Dockerfile
67
rolling-shutter/bin
78
tools/snapshot/dummyserver/dist

rolling-shutter/Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,10 @@ install-asdf-plugins:
9999
../tools/asdf-install-plugins.sh
100100

101101
install-asdf: install-asdf-plugins
102-
asdf install
102+
# Various packages installed by asdf internally also use make and don't like if an external make has already
103+
# tinkered with then environment.
104+
# Therefore we unset MAKELEVEL here.
105+
env -u MAKELEVEL asdf install
103106

104107
lint:
105108
golangci-lint run --tests

0 commit comments

Comments
 (0)