From 26bdc152246f6a1caf1f0667b5f04f1804d599fa Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Thu, 1 Dec 2016 20:32:38 +0300
Subject: Adapt to semantics change of path::normalize()

---
 build2/algorithm.cxx          | 2 +-
 build2/parser.cxx             | 4 +++-
 build2/test/script/parser.cxx | 4 +++-
 3 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'build2')

diff --git a/build2/algorithm.cxx b/build2/algorithm.cxx
index 910f073..dbdf81c 100644
--- a/build2/algorithm.cxx
+++ b/build2/algorithm.cxx
@@ -44,7 +44,7 @@ namespace build2
       fail << "unknown target type " << n.type << " in name " << n;
 
     if (!n.dir.empty ())
-      n.dir.normalize (); //@@ NORM (empty)
+      n.dir.normalize (false, true); // Current dir collapses to an empty one.
 
     // @@ OUT: for now we assume the prerequisite's out is undetermined.
     //         Would need to pass a pair of names.
diff --git a/build2/parser.cxx b/build2/parser.cxx
index b287550..2776020 100644
--- a/build2/parser.cxx
+++ b/build2/parser.cxx
@@ -659,8 +659,10 @@ namespace build2
               if (ti == nullptr)
                 fail (ploc) << "unknown target type " << pn.type;
 
+              // Current dir collapses to an empty one.
+              //
               if (!pn.dir.empty ())
-                pn.dir.normalize (); //@@ NORM (empty)
+                pn.dir.normalize (false, true);
 
               // Find or insert.
               //
diff --git a/build2/test/script/parser.cxx b/build2/test/script/parser.cxx
index 6054da9..1c3baea 100644
--- a/build2/test/script/parser.cxx
+++ b/build2/test/script/parser.cxx
@@ -1338,7 +1338,9 @@ namespace build2
 
               if (!p.empty ())
               {
-                p.normalize (); //@@ NORM
+                // Current dir collapses to an empty one.
+                //
+                p.normalize (false, true);
                 return p;
               }
 
-- 
cgit v1.1