Skip to content

Commit

Permalink
[vcpkg] Resolve --overlay-ports is only working for relative parths s…
Browse files Browse the repository at this point in the history
…ince fix… (#11302)

* Resolve --overlay-ports is only working for relative parths since fix for #10771
Fixes #11301

* use auto instead of fs::path
  • Loading branch information
TobiasFunk authored May 11, 2020
1 parent 43579f3 commit 06c647e
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion toolsrc/src/vcpkg/portfileprovider.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,15 @@ namespace vcpkg::PortFileProvider
{
if (!overlay_path.empty())
{
auto overlay = fs.canonical(VCPKG_LINE_INFO, paths.original_cwd / fs::u8path(overlay_path));
auto overlay = fs::u8path(overlay_path);
if (overlay.is_absolute())
{
overlay = fs.canonical(VCPKG_LINE_INFO, overlay);
}
else
{
overlay = fs.canonical(VCPKG_LINE_INFO, paths.original_cwd / overlay);
}

Debug::print("Using overlay: ", overlay.u8string(), "\n");

Expand Down

0 comments on commit 06c647e

Please sign in to comment.