diff options
author | Takuto Ikuta <tikuta@google.com> | 2024-06-03 20:30:14 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-06-03 07:30:14 -0400 |
commit | 9a7bd8a60f03595be5d42315790df6d409f81091 (patch) | |
tree | b220a50c5b6c76f9dc91fd7a7b7b4d17472571c7 | |
parent | 12fcca0afeb08fbe41d79c5387cfacb249992bb4 (diff) | |
download | llvm-9a7bd8a60f03595be5d42315790df6d409f81091.zip llvm-9a7bd8a60f03595be5d42315790df6d409f81091.tar.gz llvm-9a7bd8a60f03595be5d42315790df6d409f81091.tar.bz2 |
remove goma support from clang (#93942)
goma is deprecated and not maintained anymore.
https://chromium.googlesource.com/infra/goma/client/
-rw-r--r-- | clang/lib/Tooling/JSONCompilationDatabase.cpp | 5 | ||||
-rw-r--r-- | clang/unittests/Tooling/CompilationDatabaseTest.cpp | 1 |
2 files changed, 2 insertions, 4 deletions
diff --git a/clang/lib/Tooling/JSONCompilationDatabase.cpp b/clang/lib/Tooling/JSONCompilationDatabase.cpp index a776869..5ecba5d 100644 --- a/clang/lib/Tooling/JSONCompilationDatabase.cpp +++ b/clang/lib/Tooling/JSONCompilationDatabase.cpp @@ -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`. diff --git a/clang/unittests/Tooling/CompilationDatabaseTest.cpp b/clang/unittests/Tooling/CompilationDatabaseTest.cpp index 45062cf..2032b13 100644 --- a/clang/unittests/Tooling/CompilationDatabaseTest.cpp +++ b/clang/unittests/Tooling/CompilationDatabaseTest.cpp @@ -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"}, |