diff --git a/Makefile b/Makefile
index 0f3808975fc96fa98bdc7deefb56bdc60a9d0212..1155697aa189fe36fa65f9a103c32ff6d53de6b5 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,8 @@ DESTDIR ?= .local
 tempdir != mktemp -d
 os != uname -s | awk '{print tolower($$0)}'
 arch != uname -m
-goarch != eval $$(go env) && echo "$$GOARCH"
+goos != go env GOOS
+goarch != go env GOARCH
 ssh_configs != find ".ssh/config.d/" -type f \! -name '.*'
 curl = curl --location --silent --fail
 download = $(curl) --output $@