From f9e9d10bcb60b807466ddb646a9c0a0a447f7a20 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 15 Dec 2021 07:42:13 +0200
Subject: Return stable imported target name from import_direct()

---
 build2/cli/init.cxx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'build2')

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;
 
-- 
cgit v1.1