From 138ca40c2187ab4d1f11747555d9878cf3422496 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 8 Dec 2022 13:41:06 +0200
Subject: Normalize extracted header/library search directories (GH issue #235)

---
 libbuild2/cc/guess.cxx | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'libbuild2/cc/guess.cxx')

diff --git a/libbuild2/cc/guess.cxx b/libbuild2/cc/guess.cxx
index 7a2ede9..2a6ae67 100644
--- a/libbuild2/cc/guess.cxx
+++ b/libbuild2/cc/guess.cxx
@@ -412,6 +412,8 @@ namespace build2
     //
     // Note that Visual Studio versions prior to 15.0 are not supported.
     //
+    // Note also the directories are absolute and normalized.
+    //
     struct msvc_info
     {
       dir_path msvc_dir; // VC tools directory (...\Tools\MSVC\<ver>\).
@@ -777,6 +779,16 @@ namespace build2
           return nullopt;
       }
 
+      try
+      {
+        r.msvc_dir.normalize ();
+        r.psdk_dir.normalize ();
+      }
+      catch (const invalid_path&)
+      {
+        return nullopt;
+      }
+
       return r;
     }
 #endif
@@ -1537,6 +1549,8 @@ namespace build2
       msvc_extract_header_search_dirs (mo, r);
       size_t rn (r.size ());
 
+      // Note: the resulting directories are normalized by construction.
+      //
       r.push_back (dir_path (mi.msvc_dir) /= "include");
 
       // This path structure only appeared in Platform SDK 10 (if anyone wants
@@ -1586,6 +1600,8 @@ namespace build2
       msvc_extract_library_search_dirs (mo, r);
       size_t rn (r.size ());
 
+      // Note: the resulting directories are normalized by construction.
+      //
       r.push_back ((dir_path (mi.msvc_dir) /= "lib") /= cpu);
 
       // This path structure only appeared in Platform SDK 10 (if anyone wants
-- 
cgit v1.1