From 30b268dd7d8da498c15907470bc5d7b642664317 Mon Sep 17 00:00:00 2001 From: Bert Belder Date: Fri, 7 Sep 2018 20:19:44 +0200 Subject: build: override host_toolchain on windows to use sccache with v8 --- tools/setup.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'tools') diff --git a/tools/setup.py b/tools/setup.py index 9dff9eb20..737f80017 100755 --- a/tools/setup.py +++ b/tools/setup.py @@ -59,12 +59,13 @@ def get_gn_args(): # Check if ccache or sccache are in the path, and if so we set cc_wrapper. cc_wrapper = find_executable("ccache") or find_executable("sccache") if cc_wrapper: - out += [r'cc_wrapper="%s"' % cc_wrapper] - # Windows needs a custom toolchain for cc_wrapper to work. + out += ['cc_wrapper="%s"' % cc_wrapper] + # For cc_wrapper to work on Windows, we need to select our own toolchain + # by overriding 'custom_toolchain' and 'host_toolchain'. + # TODO: Is there a way to use it without the involvement of args.gn? if os.name == "nt": - out += [ - 'custom_toolchain="//build_extra/toolchain/win:win_clang_x64"' - ] + tc = "//build_extra/toolchain/win:win_clang_x64" + out += ['custom_toolchain="%s"' % tc, 'host_toolchain="%s"' % tc] print "DENO_BUILD_ARGS:", out -- cgit v1.2.3