diff options
author | Haojian Wu <hokein@google.com> | 2019-01-15 19:05:50 +0000 |
---|---|---|
committer | Haojian Wu <hokein@google.com> | 2019-01-15 19:05:50 +0000 |
commit | 0fafc3882334b5e55897aecb828afecb852256af (patch) | |
tree | 2975e9019a50f4c5e1269a8c52a25d884c9ba72e | |
parent | 7e2096bc31de2f2651f6f17799fa264e5d3943bd (diff) |
[Tooling] Make clang-tool find libc++ dir on mac when running on a file without compilation database.
Summary:
This is a regression of r348365.
When clang-tools run on a file without a complation database (`clang-check /tmp/t.cc`),
we will use fixed compilation database as a fallback. However the actual compiler
path in the fallback complation command is just `clang-tool` which is
insufficient to detect the libc++ dir.
Reviewers: ilya-biryukov, EricWF
Reviewed By: ilya-biryukov
Subscribers: cfe-commits
Differential Revision: https://reviews.llvm.org/D56680
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@351222 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | lib/Tooling/CompilationDatabase.cpp | 18 | ||||
-rw-r--r-- | test/Tooling/clang-check-mac-libcxx-fixed-compilation-db.cpp | 16 |
2 files changed, 30 insertions, 4 deletions
diff --git a/lib/Tooling/CompilationDatabase.cpp b/lib/Tooling/CompilationDatabase.cpp index 246d3c0a78..032250b2d9 100644 --- a/lib/Tooling/CompilationDatabase.cpp +++ b/lib/Tooling/CompilationDatabase.cpp @@ -227,6 +227,16 @@ struct FilterUnusedFlags { } }; +std::string GetClangToolCommand() { + static int Dummy; + std::string ClangExecutable = + llvm::sys::fs::getMainExecutable("clang", (void *)&Dummy); + SmallString<128> ClangToolPath; + ClangToolPath = llvm::sys::path::parent_path(ClangExecutable); + llvm::sys::path::append(ClangToolPath, "clang-tool"); + return ClangToolPath.str(); +} + } // namespace /// Strips any positional args and possible argv[0] from a command-line @@ -266,9 +276,9 @@ static bool stripPositionalArgs(std::vector<const char *> Args, Diagnostics)); NewDriver->setCheckInputsExist(false); - // This becomes the new argv[0]. The value is actually not important as it - // isn't used for invoking Tools. - Args.insert(Args.begin(), "clang-tool"); + // This becomes the new argv[0]. The value is used to detect libc++ include + // dirs on Mac, it isn't used for other platforms. + Args.insert(Args.begin(), GetClangToolCommand().c_str()); // By adding -c, we force the driver to treat compilation as the last phase. // It will then issue warnings via Diagnostics about un-used options that @@ -366,7 +376,7 @@ FixedCompilationDatabase::loadFromFile(StringRef Path, std::string &ErrorMsg) { FixedCompilationDatabase:: FixedCompilationDatabase(Twine Directory, ArrayRef<std::string> CommandLine) { - std::vector<std::string> ToolCommandLine(1, "clang-tool"); + std::vector<std::string> ToolCommandLine(1, GetClangToolCommand()); ToolCommandLine.insert(ToolCommandLine.end(), CommandLine.begin(), CommandLine.end()); CompileCommands.emplace_back(Directory, StringRef(), diff --git a/test/Tooling/clang-check-mac-libcxx-fixed-compilation-db.cpp b/test/Tooling/clang-check-mac-libcxx-fixed-compilation-db.cpp new file mode 100644 index 0000000000..b072380c04 --- /dev/null +++ b/test/Tooling/clang-check-mac-libcxx-fixed-compilation-db.cpp @@ -0,0 +1,16 @@ +// Clang on MacOS can find libc++ living beside the installed compiler. +// This test makes sure our libTooling-based tools emulate this properly with +// fixed compilation database. +// +// RUN: rm -rf %t +// RUN: mkdir %t +// +// Install the mock libc++ (simulates the libc++ directory structure). +// RUN: cp -r %S/Inputs/mock-libcxx %t/ +// +// RUN: cp clang-check %t/mock-libcxx/bin/ +// RUN: cp "%s" "%t/test.cpp" +// RUN: %t/mock-libcxx/bin/clang-check -p "%t" "%t/test.cpp" -- -stdlib=libc++ + +#include <mock_vector> +vector v; |