From 0e780e894854cada1244aa3f465c226593187edc Mon Sep 17 00:00:00 2001 From: Christian Moritz Date: Thu, 30 May 2019 00:34:48 +0200 Subject: tools/setup: don't download sccache if --no-binary-download is passed --- tools/prebuilt.py | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'tools/prebuilt.py') diff --git a/tools/prebuilt.py b/tools/prebuilt.py index 591cfc664..218ffae3c 100644 --- a/tools/prebuilt.py +++ b/tools/prebuilt.py @@ -18,23 +18,22 @@ def download_prebuilt(sha1_file): env=google_env()) -def load_sccache(): +def get_platform_path(tool): if sys.platform == 'win32': - p = "prebuilt/win/sccache.exe" + return "prebuilt/win/" + tool + ".exe" elif sys.platform.startswith('linux'): - p = "prebuilt/linux64/sccache" + return "prebuilt/linux64/" + tool elif sys.platform == 'darwin': - p = "prebuilt/mac/sccache" + return "prebuilt/mac/" + tool + + +def load_sccache(): + p = get_platform_path("sccache") download_prebuilt(p + ".sha1") return os.path.join(root_path, p) def load_hyperfine(): - if sys.platform == 'win32': - p = "prebuilt/win/hyperfine.exe" - elif sys.platform.startswith('linux'): - p = "prebuilt/linux64/hyperfine" - elif sys.platform == 'darwin': - p = "prebuilt/mac/hyperfine" + p = get_platform_path("hyperfine") download_prebuilt(p + ".sha1") return os.path.join(root_path, p) -- cgit v1.2.3