Skip to content

Commit b42ab6b

Browse files
committed
Makefile: use shasum from perl for portability
sha256sum is missing on macOS, but shasum appears to be available on both macOS and Ubuntu by default. Updates tailscale/tailscale#17024 Signed-off-by: James Tucker <[email protected]>
1 parent 91f82b0 commit b42ab6b

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ $(info Using ANDROID_HOME: $(ANDROID_HOME))
6565
$(info Using NDK_ROOT: $(NDK_ROOT))
6666
$(info Using STRIP_TOOL: $(STRIP_TOOL))
6767

68-
6968
# Attempt to find Android Studio for Linux configuration, which does not have a
7069
# predetermined location.
7170
ANDROID_STUDIO_ROOT ?= $(shell find ~/android-studio /usr/local/android-studio /opt/android-studio /Applications/Android\ Studio.app $(PROGRAMFILES)/Android/Android\ Studio -type d -maxdepth 1 2>/dev/null | head -n 1)
@@ -290,7 +289,7 @@ $(ANDROID_HOME)/cmdline-tools/latest/bin/sdkmanager:
290289
mkdir -p $(ANDROID_HOME)/cmdline-tools
291290
(cd $(ANDROID_HOME)/tmp && \
292291
curl --silent -O -L $(ANDROID_TOOLS_URL) && \
293-
echo $(ANDROID_TOOLS_SUM) | sha256sum -c && \
292+
echo $(ANDROID_TOOLS_SUM) | shasum -c - && \
294293
unzip $(shell basename $(ANDROID_TOOLS_URL)))
295294
mv $(ANDROID_HOME)/tmp/cmdline-tools $(ANDROID_HOME)/cmdline-tools/latest
296295
rm -rf $(ANDROID_HOME)/tmp

0 commit comments

Comments
 (0)