diff options
| author | Joel Challis <git@zvecr.com> | 2021-12-29 21:35:35 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-30 08:35:35 +1100 |
| commit | 1a8a842cfb3e87a82afb57ba29ca59c5fa6fe97b (patch) | |
| tree | 65bd758dc5fe6fae12b00df15c5d7e8de801fe78 | |
| parent | 906108fb486797ab2f3eb7c3a6f70e099c1199e6 (diff) | |
| download | qmk_firmware-1a8a842cfb3e87a82afb57ba29ca59c5fa6fe97b.tar.gz qmk_firmware-1a8a842cfb3e87a82afb57ba29ca59c5fa6fe97b.zip | |
Fix compilation-database command under MSYS (#15652)
* Fix compilation-database command under MSYS
* Add comment
| -rwxr-xr-x | lib/python/qmk/cli/generate/compilation_database.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/python/qmk/cli/generate/compilation_database.py b/lib/python/qmk/cli/generate/compilation_database.py index 602635270..7ac0f740f 100755 --- a/lib/python/qmk/cli/generate/compilation_database.py +++ b/lib/python/qmk/cli/generate/compilation_database.py | |||
| @@ -26,7 +26,8 @@ def system_libs(binary: str) -> List[Path]: | |||
| 26 | 26 | ||
| 27 | # Actually query xxxxxx-gcc to find its include paths. | 27 | # Actually query xxxxxx-gcc to find its include paths. |
| 28 | if binary.endswith("gcc") or binary.endswith("g++"): | 28 | if binary.endswith("gcc") or binary.endswith("g++"): |
| 29 | result = cli.run([binary, '-E', '-Wp,-v', '-'], capture_output=True, check=True, input='\n') | 29 | # (TODO): Remove 'stdin' once 'input' no longer causes issues under MSYS |
| 30 | result = cli.run([binary, '-E', '-Wp,-v', '-'], capture_output=True, check=True, stdin=None, input='\n') | ||
| 30 | paths = [] | 31 | paths = [] |
| 31 | for line in result.stderr.splitlines(): | 32 | for line in result.stderr.splitlines(): |
| 32 | if line.startswith(" "): | 33 | if line.startswith(" "): |