Merge pull request #28 from tailscale/tool_checksum

Makefile: make toolchain sum not use absolute path.
bradfitz/gorev
Denton Gentry 3 years ago committed by GitHub
commit 33329425b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -25,8 +25,8 @@ VERSIONCODE_PLUSONE=$(shell expr $(VERSIONCODE) + 1)
# When you update TOOLCHAINREV, also update TOOLCHAINWANT # When you update TOOLCHAINREV, also update TOOLCHAINWANT
TOOLCHAINREV=7037d3ea514849c335b5c34d1f7e9380d17bd974 TOOLCHAINREV=7037d3ea514849c335b5c34d1f7e9380d17bd974
TOOLCHAINDIR=${HOME}/.cache/tailscale-android-go-$(TOOLCHAINREV) TOOLCHAINDIR=${HOME}/.cache/tailscale-android-go-$(TOOLCHAINREV)
TOOLCHAINSUM=$(shell find $(TOOLCHAINDIR) -type f -print0 | sort -z | xargs -0 sha1sum | sha1sum | cut -d" " -f1) TOOLCHAINSUM=$(shell cd $(TOOLCHAINDIR) && find . -type f -print0 | sort -z | xargs -0 sha1sum | sha1sum | cut -d" " -f1)
TOOLCHAINWANT=1d3aded66a653a1d63c8a12952bd82327903a107 TOOLCHAINWANT=925a8ea721ba7257c1ccc06112f2bd280868b997
export PATH := $(TOOLCHAINDIR)/go/bin:$(PATH) export PATH := $(TOOLCHAINDIR)/go/bin:$(PATH)
all: $(APK) all: $(APK)

Loading…
Cancel
Save