diff options
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/setup.py | 5 | ||||
| -rw-r--r-- | tools/third_party.py | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/tools/setup.py b/tools/setup.py index 57f99f8a4..44c183553 100755 --- a/tools/setup.py +++ b/tools/setup.py @@ -122,12 +122,7 @@ def generate_gn_args(mode): if cc_wrapper: # The gn toolchain does not shell escape cc_wrapper, so do it here. out += ['cc_wrapper=%s' % gn_string(shell_quote(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": - tc = "//build_extra/toolchain/win:win_clang_x64" - out += ['custom_toolchain="%s"' % tc, 'host_toolchain="%s"' % tc] # Disable treat_warnings_as_errors until this sccache bug is fixed: # https://github.com/mozilla/sccache/issues/264 out += ["treat_warnings_as_errors=false"] diff --git a/tools/third_party.py b/tools/third_party.py index 65ff437b7..46a9cf82e 100644 --- a/tools/third_party.py +++ b/tools/third_party.py @@ -105,7 +105,6 @@ def fix_symlinks(): # and it's target are in different repos. Here we fix the symlinks that exist # in the root repo while their target is in the third_party repo. remove_and_symlink("third_party/node_modules", root("node_modules"), True) - remove_and_symlink("third_party/v8/build", root("build"), True) remove_and_symlink("third_party/v8/buildtools", root("buildtools"), True) remove_and_symlink("third_party/v8/build_overrides", root("build_overrides"), True) @@ -260,7 +259,8 @@ def maybe_download_sysroot(): if sys.platform.startswith('linux'): run([ 'python', - tp('v8/build/linux/sysroot_scripts/install-sysroot.py'), + os.path.join(root_path, + 'build/linux/sysroot_scripts/install-sysroot.py'), '--arch=amd64' ], env=google_env()) |