From 0d275db1433dec9bc7b4fcf5fcd28b42da3b6166 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 6 Sep 2018 19:20:01 +0200
Subject: Fix issues with interaction between binless logic and Windows DLLs

---
 build2/cc/common.cxx | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'build2/cc/common.cxx')

diff --git a/build2/cc/common.cxx b/build2/cc/common.cxx
index 6a1698e..ae125a5 100644
--- a/build2/cc/common.cxx
+++ b/build2/cc/common.cxx
@@ -614,9 +614,7 @@ namespace build2
       libs* s (nullptr);
 
       pair<path, path> pc; // pkg-config .pc file paths.
-
-      path f; // Reuse the buffer.
-      const dir_path* pd (nullptr);
+      path f;              // Reuse the buffer.
 
       auto search =[&a, &s, &pc,
                     &an, &ae,
@@ -670,7 +668,7 @@ namespace build2
                 // but valid timestamp (aka "trust me, it's there").
                 //
                 s->mtime (mt);
-                s->path (path ());
+                s->path (empty_path);
               }
             }
             else
@@ -787,6 +785,7 @@ namespace build2
       if (!usrd)
         usrd = extract_library_dirs (*p.scope);
 
+      const dir_path* pd (nullptr);
       for (const dir_path& d: *usrd)
       {
         if (search (d))
-- 
cgit v1.1