foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-12-31 11:34:15 -05:00
Code Issues Packages 1 Wiki Activity

build: do not quote cc_wrapper on windows

Browse source 
This brings behavior inline with the unix toolchain, which also leaves
cc_wrapper unquoted. If necessary, add quotes in the setup phase instead.
This commit is contained in:
Bert Belder 2018-09-25 14:48:07 -07:00
parent 023b4640fc
commit 531a427d88
No known key found for this signature in database
GPG key ID: 7A77887B2E2ED461
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build_extra/toolchain/win/mods.gni
View file

@ -20,9 +20,9 @@ import("//build/toolchain/cc_wrapper.gni")
# Some python scripts that are run by BUILD.gni live here.
base_toolchain_dir = "//build/toolchain/win"
# If cc_wrapper if is set, wrap it in quotes and add a space to it.
# If cc_wrapper if is set, add a space to it.
if (cc_wrapper == "") {
cc_wrapper_prefix = ""
} else {
cc_wrapper_prefix = "\"$cc_wrapper\" "
cc_wrapper_prefix = "$cc_wrapper "
}

4
tools/setup.py
View file

@ -1,6 +1,7 @@
#!/usr/bin/env python
import third_party
from util import build_mode, build_path, enable_ansi_colors, root_path, run
from util import shell_quote
import os
import re
import sys
@ -114,7 +115,8 @@ def generate_gn_args(mode):
# 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 += ['cc_wrapper="%s"' % 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?