Zengtudor/ccls
1
0
Fork 0
mirror of https://github.com/MaskRay/ccls.git synced 2024-11-26 01:21:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Restore call to GetPlatformClangArguments

Browse Source
This commit is contained in:
Jacob Dufault 2018-03-19 16:48:07 -07:00 committed by Fangrui Song
parent fb304d5c95
commit 997bcdf05a
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/project.cc
View File

@ -27,6 +27,8 @@
#include <unordered_set> #include <unordered_set>
#include <vector> #include <vector>
extern bool gTestOutputMode;
struct CompileCommandsEntry { struct CompileCommandsEntry {
std::string directory; std::string directory;
std::string file; std::string file;
@ -208,6 +210,12 @@ Project::Entry GetCompilationEntryFromCompileCommandEntry(
if (!AnyStartsWith(args, "-working-directory")) if (!AnyStartsWith(args, "-working-directory"))
result.args.emplace_back("-working-directory=" + entry.directory); result.args.emplace_back("-working-directory=" + entry.directory);
if (!gTestOutputMode) {
std::vector<const char*> platform = GetPlatformClangArguments();
for (auto arg : platform)
result.args.push_back(arg);
}
bool next_flag_is_path = false; bool next_flag_is_path = false;
bool add_next_flag_to_quote_dirs = false; bool add_next_flag_to_quote_dirs = false;
bool add_next_flag_to_angle_dirs = false; bool add_next_flag_to_angle_dirs = false;
@ -622,6 +630,7 @@ TEST_SUITE("Project") {
std::vector<std::string> raw, std::vector<std::string> raw,
std::vector<std::string> expected) { std::vector<std::string> expected) {
g_disable_normalize_path_for_test = true; g_disable_normalize_path_for_test = true;
gTestOutputMode = true;
Config config; Config config;
ProjectConfig project; ProjectConfig project;