diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2021-12-15 07:42:13 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2021-12-15 07:42:13 +0200 |
| commit | f9e9d10bcb60b807466ddb646a9c0a0a447f7a20 (patch) | |
| tree | 65f3b3eb56a6bc85ebfadb1cf1d27a25fdb0feb5 /build2 | |
| parent | 89aaf4d9eb26564b88c1ff400a12277e5ee45c1a (diff) | |
Return stable imported target name from import_direct()
Diffstat (limited to 'build2')
| -rw-r--r-- | build2/cli/init.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/build2/cli/init.cxx b/build2/cli/init.cxx index eadf32c..2a07196 100644 --- a/build2/cli/init.cxx +++ b/build2/cli/init.cxx @@ -84,7 +84,7 @@ namespace build2 // module unconfigured. // bool new_cfg (false); - pair<const exe*, import_kind> ir ( + import_result<exe> ir ( import_direct<exe> ( new_cfg, rs, @@ -95,7 +95,7 @@ namespace build2 loc, "module load")); - const exe* tgt (ir.first); + const exe* tgt (ir.target); // Extract metadata. // @@ -125,7 +125,7 @@ namespace build2 // The cli variable (untyped) is an imported compiler target name. // - rs.assign ("cli") = tgt->as_name (); + rs.assign ("cli") = move (ir.name); rs.assign (v_sum) = *sum; rs.assign (v_ver) = *ver; |