openharmony/third_party_ninja
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_ninja synced 2024-11-23 07:20:07 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

IssueNo: https://gitee.com/openharmony/third_party_ninja/issues/IAXE3P

Browse Source 
Signed-off-by: liangxinyan <liangxinyan2@huawei.com>
This commit is contained in:
liangxinyan 2024-10-16 09:41:37 +08:00
parent feabb94884
commit 67d7e8c464
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/build.cc
View File

@ -752,7 +752,7 @@ static std::string &Trim(std::string &s)
return s; return s;
} }
static std::vector<std::string> SplitStringBySpace(std::string content) static std::vector<std::string> SplitStringBySpace(std::string content)
{ {
std::string space_delimiter = " "; std::string space_delimiter = " ";
std::vector<std::string> words{}; std::vector<std::string> words{};
@ -773,7 +773,8 @@ static std::vector<std::string> SplitStringBySpace(std::string content)
return words; return words;
} }
static std::string SplicingWholeContent(std::string content, std::string whole_content, bool is_whole_archive) { static std::string SplicingWholeContent(std::string content, std::string whole_content, bool is_whole_archive)
{
if (whole_content.empty()) { if (whole_content.empty()) {
return content; return content;
} }
@ -805,7 +806,8 @@ static std::string SplicingWholeContent(std::string content, std::string whole_c
return result; return result;
} }
std::string Builder::GetContent(Edge* edge) { std::string Builder::GetContent(Edge* edge)
{
std::string content = edge->GetBinding("rspfile_content"); std::string content = edge->GetBinding("rspfile_content");
std::string toolchain_whole_status = edge->env_->LookupVariable("toolchain_whole_status"); std::string toolchain_whole_status = edge->env_->LookupVariable("toolchain_whole_status");
@ -881,7 +883,7 @@ bool Builder::FinishCommand(CommandRunner::Result* result, string* err) {
if (!deps_type.empty()) { if (!deps_type.empty()) {
string extract_err; string extract_err;
if (!ExtractDeps(result, deps_type, deps_prefix, &deps_nodes, if (!ExtractDeps(result, deps_type, deps_prefix, &deps_nodes,
&extract_err) && result->success()) { &extract_err) && result->success()) {
if (!result->output.empty()) if (!result->output.empty())
result->output.append("\n"); result->output.append("\n");
result->output.append(extract_err); result->output.append(extract_err);
@ -896,7 +898,7 @@ bool Builder::FinishCommand(CommandRunner::Result* result, string* err) {
running_edges_.erase(it); running_edges_.erase(it);
status_->BuildEdgeFinished(edge, start_time_millis, end_time_millis, status_->BuildEdgeFinished(edge, start_time_millis, end_time_millis,
result->success(), result->output); result->success(), result->output);
// The rest of this function only applies to successful commands. // The rest of this function only applies to successful commands.
if (!result->success()) { if (!result->success()) {
@ -949,7 +951,7 @@ bool Builder::FinishCommand(CommandRunner::Result* result, string* err) {
if (scan_.build_log()) { if (scan_.build_log()) {
if (!scan_.build_log()->RecordCommand(edge, start_time_millis, if (!scan_.build_log()->RecordCommand(edge, start_time_millis,
end_time_millis, record_mtime)) { end_time_millis, record_mtime)) {
*err = string("Error writing to build log: ") + strerror(errno); *err = string("Error writing to build log: ") + strerror(errno);
return false; return false;
} }