Skip to content

Commit

Permalink
[build] fix ambiguous operator=
Browse files Browse the repository at this point in the history
  • Loading branch information
k2rate committed Nov 29, 2024
1 parent d801946 commit 184b74b
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions buildkit/re/build/default_build_context.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ namespace re

if (auto entry = target.GetCfgEntry<std::string>("out-dir"))
{
out_dir = vars.Resolve(*entry);
out_dir = (fs::path)vars.Resolve(*entry);

if (target.path <= fs::current_path() || out_dir.u8string().front() == '.')
out_dir = target.path / out_dir;
Expand Down Expand Up @@ -455,7 +455,7 @@ namespace re
// Resolve all the paths
for (auto it = desc.artifacts.begin(); it != desc.artifacts.end(); it++)
{
it.value() = it->first->build_var_scope->Resolve(it->second.generic_u8string());
it.value() = (fs::path)it->first->build_var_scope->Resolve(it->second.generic_u8string());
}

desc.meta["root_target"] = target.root->module;
Expand Down

0 comments on commit 184b74b

Please sign in to comment.