Skip to content

Commit 204173d

Browse files
committed
Makefile: use explicit path to command invocations
Make does not respect PATH updates made inside the Makefile for program lookup in invocations. This can be worked around a number of ways, but differences between the Linux gmake versions in CI, and the macOS gmake versions on developer machines constrain us. Updates #501 Signed-off-by: James Tucker <[email protected]>
1 parent b3a7f7f commit 204173d

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -149,13 +149,13 @@ android/libs:
149149
mkdir -p android/libs
150150

151151
$(GOBIN)/gomobile: $(GOBIN)/gobind go.mod go.sum
152-
go install golang.org/x/mobile/cmd/gomobile
152+
./tool/go install golang.org/x/mobile/cmd/gomobile
153153

154154
$(GOBIN)/gobind: go.mod go.sum
155-
go install golang.org/x/mobile/cmd/gobind
155+
./tool/go install golang.org/x/mobile/cmd/gobind
156156

157157
$(LIBTAILSCALE): Makefile android/libs $(shell find libtailscale -name *.go) go.mod go.sum $(GOBIN)/gomobile
158-
gomobile bind -target android -androidapi 26 \
158+
$(GOBIN)/gomobile bind -target android -androidapi 26 \
159159
-ldflags "$(FULL_LDFLAGS)" \
160160
-o $@ ./libtailscale
161161

@@ -220,9 +220,9 @@ update-version: ## Update the version in build.gradle
220220

221221
.PHONY: update-oss
222222
update-oss: ## Update the tailscale.com go module and update the version in build.gradle
223-
GOPROXY=direct go get tailscale.com@main
224-
go run tailscale.com/cmd/printdep --go > go.toolchain.rev
225-
go mod tidy -compat=1.23
223+
GOPROXY=direct ./tool/go get tailscale.com@main
224+
./tool/go run tailscale.com/cmd/printdep --go > go.toolchain.rev
225+
./tool/go mod tidy -compat=1.23
226226

227227
# Get the commandline tools package, this provides (among other things) the sdkmanager binary.
228228
$(ANDROID_HOME)/cmdline-tools/latest/bin/sdkmanager:

0 commit comments

Comments
 (0)