Zengtudor/ccls
1
0
Fork 0
mirror of https://github.com/MaskRay/ccls.git synced 2025-04-20 23:53:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[waf] Use str for Python 2

Browse Source
This commit is contained in:
Fangrui Song 2018-02-04 11:01:02 -08:00
parent d573a68130
commit 2c787fe1fe
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wscript
View File

@ -238,9 +238,9 @@ def configure(ctx):
# Use the detected clang executable to infer resource directory # Use the detected clang executable to infer resource directory
# Use `clang -### -xc /dev/null` instead of `clang -print-resource-dir` because the option is unavailable in 4.0.0 # Use `clang -### -xc /dev/null` instead of `clang -print-resource-dir` because the option is unavailable in 4.0.0
devnull = '/dev/null' if sys.platform != 'win32' else 'NUL' devnull = '/dev/null' if sys.platform != 'win32' else 'NUL'
output = subprocess.check_output( output = str(subprocess.check_output(
[clang, '-###', '-xc', devnull], [clang, '-###', '-xc', devnull],
stderr=subprocess.STDOUT).decode() stderr=subprocess.STDOUT).decode())
match = re.search(r'"-resource-dir" "([^"]*)"', output, re.M) match = re.search(r'"-resource-dir" "([^"]*)"', output, re.M)
if match: if match:
ctx.env.default_resource_directory = match.group(1) ctx.env.default_resource_directory = match.group(1)