yggdrasil/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove goma support from clang (#93942)

Browse Source 
goma is deprecated and not maintained anymore.

https://chromium.googlesource.com/infra/goma/client/
This commit is contained in:
Takuto Ikuta 2024-06-03 20:30:14 +09:00 committed by GitHub
parent 12fcca0afe
commit 9a7bd8a60f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
clang/lib/Tooling/JSONCompilationDatabase.cpp
View File

@ -260,7 +260,7 @@ static llvm::StringRef stripExecutableExtension(llvm::StringRef Name) {
return Name;
}
// There are compiler-wrappers (ccache, distcc, gomacc) that take the "real"
// There are compiler-wrappers (ccache, distcc) that take the "real"
// compiler as an argument, e.g. distcc gcc -O3 foo.c.
// These end up in compile_commands.json when people set CC="distcc gcc".
// Clang's driver doesn't understand this, so we need to unwrap.
@ -269,8 +269,7 @@ static bool unwrapCommand(std::vector<std::string> &Args) {
return false;
StringRef Wrapper =
stripExecutableExtension(llvm::sys::path::filename(Args.front()));
if (Wrapper == "distcc" || Wrapper == "gomacc" || Wrapper == "ccache" ||
Wrapper == "sccache") {
if (Wrapper == "distcc" || Wrapper == "ccache" || Wrapper == "sccache") {
// Most of these wrappers support being invoked 3 ways:
// `distcc g++ file.c` This is the mode we're trying to match.
// We need to drop `distcc`.

1
clang/unittests/Tooling/CompilationDatabaseTest.cpp
View File

@ -402,7 +402,6 @@ TEST(findCompileArgsInJsonDatabase, FindsEntry) {
TEST(findCompileArgsInJsonDatabase, ParsesCompilerWrappers) {
std::vector<std::pair<std::string, std::string>> Cases = {
{"distcc gcc foo.c", "gcc foo.c"},
{"gomacc clang++ foo.c", "clang++ foo.c"},
{"sccache clang++ foo.c", "clang++ foo.c"},
{"ccache gcc foo.c", "gcc foo.c"},
{"ccache.exe gcc foo.c", "gcc foo.c"},