diff options
| -rw-r--r-- | tools/prebuilt.py | 19 | ||||
| -rwxr-xr-x | tools/setup.py | 3 |
2 files changed, 11 insertions, 11 deletions
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) diff --git a/tools/setup.py b/tools/setup.py index 9a4b443dd..6060ce8f1 100755 --- a/tools/setup.py +++ b/tools/setup.py @@ -31,6 +31,7 @@ def main(): third_party.download_clang_format() third_party.download_clang() third_party.maybe_download_sysroot() + prebuilt.load_sccache() write_lastchange() @@ -125,7 +126,7 @@ def generate_gn_args(mode): if "DENO_BUILD_ARGS" in os.environ: out += os.environ["DENO_BUILD_ARGS"].split() - cacher = prebuilt.load_sccache() + cacher = os.path.join(root_path, prebuilt.get_platform_path("sccache")) if not os.path.exists(cacher): cacher = find_executable("sccache") or find_executable("ccache") |