aboutsummaryrefslogtreecommitdiff
path: root/lib/python/qmk
diff options
context:
space:
mode:
Diffstat (limited to 'lib/python/qmk')
-rwxr-xr-xlib/python/qmk/compilation_database.py17
1 files changed, 10 insertions, 7 deletions
diff --git a/lib/python/qmk/compilation_database.py b/lib/python/qmk/compilation_database.py
index 4c88dadbdd..851dc3f157 100755
--- a/lib/python/qmk/compilation_database.py
+++ b/lib/python/qmk/compilation_database.py
@@ -41,11 +41,10 @@ def cpu_defines(binary: str, compiler_args: str) -> List[str]:
if binary.endswith("gcc") or binary.endswith("g++"):
invocation = [binary, '-dM', '-E']
if binary.endswith("gcc"):
- invocation.extend(['-x', 'c'])
+ invocation.extend(['-x', 'c', '-std=gnu11'])
elif binary.endswith("g++"):
- invocation.extend(['-x', 'c++'])
- compiler_args = shlex.split(compiler_args)
- invocation.extend(compiler_args)
+ invocation.extend(['-x', 'c++', '-std=gnu++14'])
+ invocation.extend(shlex.split(compiler_args))
invocation.append('-')
result = cli.run(invocation, capture_output=True, check=True, stdin=None, input='\n')
define_args = []
@@ -55,7 +54,11 @@ def cpu_defines(binary: str, compiler_args: str) -> List[str]:
define_args.append(f'-D{line_args[1]}={line_args[2]}')
elif len(line_args) == 2 and line_args[0] == '#define':
define_args.append(f'-D{line_args[1]}')
- return list(sorted(set(define_args)))
+
+ type_filter = re.compile(
+ r'^-D__(SIZE|INT|UINT|WINT|WCHAR|BYTE|SHRT|SIG|FLOAT|LONG|CHAR|SCHAR|DBL|FLT|LDBL|PTRDIFF|QQ|DQ|DA|HA|HQ|SA|SQ|TA|TQ|UDA|UDQ|UHA|UHQ|USQ|USA|UTQ|UTA|UQQ|UQA|ACCUM|FRACT|UACCUM|UFRACT|LACCUM|LFRACT|ULACCUM|ULFRACT|LLACCUM|LLFRACT|ULLACCUM|ULLFRACT|SACCUM|SFRACT|USACCUM|USFRACT)'
+ )
+ return list(sorted(set(filter(lambda x: not type_filter.match(x), define_args))))
return []
@@ -92,8 +95,8 @@ def parse_make_n(f: Iterator[str]) -> List[Dict[str, str]]:
for s in system_libs(binary):
args += ['-isystem', '%s' % s]
args.extend(cpu_defines(binary, ' '.join(shlex.quote(s) for s in compiler_args)))
- new_cmd = ' '.join(shlex.quote(s) for s in args)
- records.append({"directory": str(QMK_FIRMWARE.resolve()), "command": new_cmd, "file": this_file})
+ args[0] = binary
+ records.append({"arguments": args, "directory": str(QMK_FIRMWARE.resolve()), "file": this_file})
state = 'start'
return records