From 243da3993c138d33063f633aa3996a8a710ea396 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 15 Jul 2015 14:44:15 +0200
Subject: Implement project-qualified names/prerequisites, two-stage import

---
 build/algorithm.cxx | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'build/algorithm.cxx')

diff --git a/build/algorithm.cxx b/build/algorithm.cxx
index 488bbb7..83a6510 100644
--- a/build/algorithm.cxx
+++ b/build/algorithm.cxx
@@ -15,6 +15,7 @@
 #include <build/target>
 #include <build/prerequisite>
 #include <build/rule>
+#include <build/file> // import()
 #include <build/search>
 #include <build/context>
 #include <build/utility>
@@ -28,6 +29,12 @@ namespace build
   target&
   search (const prerequisite_key& pk)
   {
+    // If this is a project-qualified prerequisite, then this
+    // is import's business.
+    //
+    if (*pk.proj != nullptr)
+      return import (pk);
+
     if (target* t = pk.tk.type->search (pk))
       return *t;
 
-- 
cgit v1.1