diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2018-09-06 19:20:01 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2018-09-06 19:20:01 +0200 |
| commit | 0d275db1433dec9bc7b4fcf5fcd28b42da3b6166 (patch) | |
| tree | f0101c7e5ce0ba17b1d4cc3aaecb3bb2c584afc0 /build2/cc/common.cxx | |
| parent | d9adcc48df7d5b64427d3b292f9ebfa14461c0f9 (diff) | |
Fix issues with interaction between binless logic and Windows DLLs
Diffstat (limited to 'build2/cc/common.cxx')
| -rw-r--r-- | build2/cc/common.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
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)) |