compiledb: query include paths from gcc directly. (#14462)

* Query include paths from gcc directly.

* Change to -isystem

* qmk format-python

* tests
master
Nick Brassel 2021-09-20 14:15:07 +10:00 committed by GitHub
parent bf613eb9db
commit 28b8b578b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 2 deletions

View File

@ -1,7 +1,6 @@
"""Creates a compilation database for the given keyboard build. """Creates a compilation database for the given keyboard build.
""" """
import itertools
import json import json
import os import os
import re import re
@ -24,6 +23,16 @@ def system_libs(binary: str) -> List[Path]:
""" """
cli.log.debug("searching for system library directory for binary: %s", binary) cli.log.debug("searching for system library directory for binary: %s", binary)
bin_path = shutil.which(binary) bin_path = shutil.which(binary)
# Actually query xxxxxx-gcc to find its include paths.
if binary.endswith("gcc") or binary.endswith("g++"):
result = cli.run([binary, '-E', '-Wp,-v', '-'], capture_output=True, check=True, input='\n')
paths = []
for line in result.stderr.splitlines():
if line.startswith(" "):
paths.append(Path(line.strip()).resolve())
return paths
return list(Path(bin_path).resolve().parent.parent.glob("*/include")) if bin_path else [] return list(Path(bin_path).resolve().parent.parent.glob("*/include")) if bin_path else []
@ -55,7 +64,8 @@ def parse_make_n(f: Iterator[str]) -> List[Dict[str, str]]:
# we have a hit! # we have a hit!
this_cmd = m.group(1) this_cmd = m.group(1)
args = shlex.split(this_cmd) args = shlex.split(this_cmd)
args += ['-I%s' % s for s in system_libs(args[0])] for s in system_libs(args[0]):
args += ['-isystem', '%s' % s]
new_cmd = ' '.join(shlex.quote(s) for s in args if s != '-mno-thumb-interwork') new_cmd = ' '.join(shlex.quote(s) for s in args if s != '-mno-thumb-interwork')
records.append({"directory": str(QMK_FIRMWARE.resolve()), "command": new_cmd, "file": this_file}) records.append({"directory": str(QMK_FIRMWARE.resolve()), "command": new_cmd, "file": this_file})
state = 'start' state = 'start'