From 4689147cf4b1c2d507fd8bbb8eb748a7bbaad4ef Mon Sep 17 00:00:00 2001 From: Chris Sauer Date: Thu, 4 Apr 2024 23:52:53 -0700 Subject: [PATCH] Remove sysroot -> isysroot patch now that the clangd bug is fixed See https://github.com/hedronvision/bazel-compile-commands-extractor/issues/82 and https://github.com/hedronvision/bazel-compile-commands-extractor/issues/179 for context --- refresh.template.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/refresh.template.py b/refresh.template.py index 8c36d32..3b33701 100644 --- a/refresh.template.py +++ b/refresh.template.py @@ -870,11 +870,6 @@ def _all_platform_patch(compile_args: typing.List[str]): # For more context see: https://github.com/hedronvision/bazel-compile-commands-extractor/issues/21 compile_args = (arg for arg in compile_args if not arg == '-fno-canonical-system-headers') - # Swap -isysroot in for --sysroot to work around some unknown sysroot bug in clangd. - # For context, see https://github.com/hedronvision/bazel-compile-commands-extractor/issues/82 - # The = logic has to do with clang not accepting -isysroot=, but accepting --sysroot=. Note that -isysroot is accepted, though undocumented. - compile_args = ('-isysroot'+arg[len('--sysroot')+arg.startswith('--sysroot='):] if arg.startswith('--sysroot') else arg for arg in compile_args) - # Strip out -gcc-toolchain to work around https://github.com/clangd/clangd/issues/1248 skip_next = False new_compile_args = []