Skip to content

Commit 9a7bd8a

Browse files
authoredJun 3, 2024··
remove goma support from clang (#93942)
goma is deprecated and not maintained anymore. https://chromium.googlesource.com/infra/goma/client/
1 parent 12fcca0 commit 9a7bd8a

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed
 

‎clang/lib/Tooling/JSONCompilationDatabase.cpp

+2-3
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ static llvm::StringRef stripExecutableExtension(llvm::StringRef Name) {
260260
return Name;
261261
}
262262

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

‎clang/unittests/Tooling/CompilationDatabaseTest.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,6 @@ TEST(findCompileArgsInJsonDatabase, FindsEntry) {
402402
TEST(findCompileArgsInJsonDatabase, ParsesCompilerWrappers) {
403403
std::vector<std::pair<std::string, std::string>> Cases = {
404404
{"distcc gcc foo.c", "gcc foo.c"},
405-
{"gomacc clang++ foo.c", "clang++ foo.c"},
406405
{"sccache clang++ foo.c", "clang++ foo.c"},
407406
{"ccache gcc foo.c", "gcc foo.c"},
408407
{"ccache.exe gcc foo.c", "gcc foo.c"},

0 commit comments

Comments
 (0)
Please sign in to comment.