aboutsummaryrefslogtreecommitdiff
path: root/libbuild2/cc/common.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'libbuild2/cc/common.cxx')
-rw-r--r--libbuild2/cc/common.cxx16
1 files changed, 2 insertions, 14 deletions
diff --git a/libbuild2/cc/common.cxx b/libbuild2/cc/common.cxx
index 99de66e..cf6d546 100644
--- a/libbuild2/cc/common.cxx
+++ b/libbuild2/cc/common.cxx
@@ -465,20 +465,8 @@ namespace build2
{
// This is import.
//
- name n (cn);
- auto rp (s.find_target_type (n, location ())); // Note: changes name.
- const target_type* tt (rp.first);
- optional<string>& ext (rp.second);
-
- if (tt == nullptr)
- fail << "unknown target type '" << n.type << "' in library " << n;
-
- // @@ OUT: for now we assume out is undetermined, just like in
- // search (name, scope).
- //
- dir_path out;
-
- prerequisite_key pk {n.proj, {tt, &n.dir, &out, &n.value, ext}, &s};
+ name n (cn), o; // Note: find_prerequisite_key() changes name.
+ prerequisite_key pk (s.find_prerequisite_key (n, o, location ()));
xt = search_library_existing (a, sysd, usrd, pk);
if (xt == nullptr)