Skip to content

Commit

Permalink
tools/setup: don't download sccache if --no-binary-download is passed
Browse files Browse the repository at this point in the history
  • Loading branch information
chrmoritz authored and ry committed May 30, 2019
1 parent 15dadf8 commit 0e780e8
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
19 changes: 9 additions & 10 deletions tools/prebuilt.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
3 changes: 2 additions & 1 deletion tools/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down Expand Up @@ -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")

Expand Down

0 comments on commit 0e780e8

Please sign in to comment.