Skip to content

[clangd] Forward --target to system include extraction #65824

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 11, 2023
Merged

[clangd] Forward --target to system include extraction #65824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions clang-tools-extra/clangd/SystemIncludeExtractor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,13 @@ struct DriverArgs {
std::string Lang;
std::string Sysroot;
std::string ISysroot;
std::string Target;

bool operator==(const DriverArgs &RHS) const {
return std::tie(Driver, StandardIncludes, StandardCXXIncludes, Lang,
Sysroot, ISysroot) ==
Sysroot, ISysroot, Target) ==
std::tie(RHS.Driver, RHS.StandardIncludes, RHS.StandardCXXIncludes,
RHS.Lang, RHS.Sysroot, ISysroot);
RHS.Lang, RHS.Sysroot, RHS.ISysroot, RHS.Target);
}

DriverArgs(const tooling::CompileCommand &Cmd, llvm::StringRef File) {
Expand Down Expand Up @@ -130,6 +131,11 @@ struct DriverArgs {
ISysroot = Cmd.CommandLine[I + 1];
else
ISysroot = Arg.str();
} else if (Arg.consume_front("--target=")) {
Target = Arg.str();
} else if (Arg.consume_front("-target")) {
if (Arg.empty() && I + 1 < E)
Target = Cmd.CommandLine[I + 1];
}
}

Expand Down Expand Up @@ -167,6 +173,8 @@ struct DriverArgs {
Args.append({"--sysroot", Sysroot});
if (!ISysroot.empty())
Args.append({"-isysroot", ISysroot});
if (!Target.empty())
Args.append({"-target", Target});
return Args;
}

Expand Down
5 changes: 3 additions & 2 deletions clang-tools-extra/clangd/test/system-include-extractor.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
# RUN: echo '[ -z "${args##*"-nostdinc"*}" ] || exit' >> %t.dir/bin/my_driver.sh
# RUN: echo '[ -z "${args##*"--sysroot /my/sysroot/path"*}" ] || exit' >> %t.dir/bin/my_driver.sh
# RUN: echo '[ -z "${args##*"-isysroot /isysroot"*}" ] || exit' >> %t.dir/bin/my_driver.sh
# RUN: echo '[ -z "${args##*"-target arm-linux-gnueabihf"*}" ] || exit' >> %t.dir/bin/my_driver.sh
# RUN: echo 'echo line to ignore >&2' >> %t.dir/bin/my_driver.sh
# RUN: echo 'printf "Target: arm-linux-gnueabihf\r\n" >&2' >> %t.dir/bin/my_driver.sh
# RUN: echo 'printf "#include <...> search starts here:\r\n" >&2' >> %t.dir/bin/my_driver.sh
Expand All @@ -36,7 +37,7 @@

# Generate a compile_commands.json that will query the mock driver we've
# created. Which should add a.h and b.h into include search path.
# RUN: echo '[{"directory": "%/t.dir", "command": "my_driver.sh the-file.cpp -nostdinc --sysroot /my/sysroot/path -isysroot/isysroot", "file": "the-file.cpp"}]' > %t.dir/compile_commands.json
# RUN: echo '[{"directory": "%/t.dir", "command": "my_driver.sh the-file.cpp --target=arm-linux-gnueabihf -nostdinc --sysroot /my/sysroot/path -isysroot/isysroot", "file": "the-file.cpp"}]' > %t.dir/compile_commands.json

# RUN: sed -e "s|INPUT_DIR|%/t.dir|g" %s > %t.test.1
# On Windows, we need the URI in didOpen to look like "uri":"file:///C:/..."
Expand Down Expand Up @@ -74,7 +75,7 @@
{"jsonrpc":"2.0","method":"exit"}

# Generate a different compile_commands.json which does not point to the mock driver
# RUN: echo '[{"directory": "%/t.dir", "command": "gcc the-file.cpp -nostdinc --sysroot /my/sysroot/path -isysroot/isysroot", "file": "the-file.cpp"}]' > %t.dir/compile_commands.json
# RUN: echo '[{"directory": "%/t.dir", "command": "gcc the-file.cpp --target=arm-linux-gnueabihf -nostdinc --sysroot /my/sysroot/path -isysroot/isysroot", "file": "the-file.cpp"}]' > %t.dir/compile_commands.json

# Generate a clangd config file which points to the mock driver instead
# RUN: echo 'CompileFlags:' > %t.dir/.clangd
Expand Down