From f57f97a7fde4ebe69c160530d61fcd958aac0cf3 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 11 Sep 2015 13:07:40 +0200
Subject: Preserve pairs in expansion

---
 build/parser.cxx | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'build')

diff --git a/build/parser.cxx b/build/parser.cxx
index 65be0bc..227e5b3 100644
--- a/build/parser.cxx
+++ b/build/parser.cxx
@@ -523,6 +523,8 @@ namespace build
           p /= path ("buildfile");
       }
 
+      level6 ([&]{trace (l) << "relative path " << p;});
+
       // Determine new out_base.
       //
       dir_path out_base;
@@ -563,6 +565,8 @@ namespace build
       if (p.relative ())
         p = scope_->src_path () / p.leaf ();
 
+      level6 ([&]{trace (l) << "absolute path " << p;});
+
       if (!root_->buildfiles.insert (p).second) // Note: may be "new" root.
       {
         level5 ([&]{trace (l) << "skipping already included " << p;});
@@ -1263,6 +1267,8 @@ namespace build
                              (dp1 != nullptr ? *dp1 : dir_path ()),
                              (tp1 != nullptr ? *tp1 : string ()),
                              n.value);
+
+            ns.back ().pair = n.pair;
           }
 
           count = lv.size ();
-- 
cgit v1.1