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/common.cxx    |  6 ++++++
 libbuild2/cc/gcc.cxx       | 12 ++++++++----
 libbuild2/cc/guess.cxx     | 16 ++++++++++++++++
 libbuild2/cc/msvc.cxx      | 26 +++++++++++++++++---------
 libbuild2/cc/pkgconfig.cxx |  1 +
 5 files changed, 48 insertions(+), 13 deletions(-)

(limited to 'libbuild2/cc')

diff --git a/libbuild2/cc/common.cxx b/libbuild2/cc/common.cxx
index 3eaa523..0af9531 100644
--- a/libbuild2/cc/common.cxx
+++ b/libbuild2/cc/common.cxx
@@ -822,6 +822,8 @@ namespace build2
     // always a file. The second half of the returned pair is the group, if
     // the member was picked.
     //
+    // Note: paths in sysd/usrd are expected to be absolute and normalized.
+    //
     // Note: may throw non_existent_library.
     //
     pair<const mtime_target&, const target*> common::
@@ -929,6 +931,8 @@ namespace build2
     // Action should be absent if called during the load phase. Note that pk's
     // scope should not be NULL (even if dir is absolute).
     //
+    // Note: paths in sysd/usrd are expected to be absolute and normalized.
+    //
     // Note: see similar logic in find_system_library().
     //
     target* common::
@@ -1262,6 +1266,8 @@ namespace build2
             // making it the only one to allow things to be overriden (e.g.,
             // if build2 was moved or some such).
             //
+            // Note: build_install_lib is already normalized.
+            //
             usrd->insert (usrd->begin (), build_install_lib);
           }
         }
diff --git a/libbuild2/cc/gcc.cxx b/libbuild2/cc/gcc.cxx
index 755b0d8..b553c8c 100644
--- a/libbuild2/cc/gcc.cxx
+++ b/libbuild2/cc/gcc.cxx
@@ -45,6 +45,13 @@ namespace build2
             d = dir_path (o, 2, string::npos);
           else
             continue;
+
+          // Ignore relative paths. Or maybe we should warn?
+          //
+          if (d.relative ())
+            continue;
+
+          d.normalize ();
         }
         catch (const invalid_path& e)
         {
@@ -52,10 +59,7 @@ namespace build2
                << o << "'";
         }
 
-        // Ignore relative paths. Or maybe we should warn?
-        //
-        if (!d.relative ())
-          r.push_back (move (d));
+        r.push_back (move (d));
       }
     }
 
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
diff --git a/libbuild2/cc/msvc.cxx b/libbuild2/cc/msvc.cxx
index 69c939a..3a7fd6f 100644
--- a/libbuild2/cc/msvc.cxx
+++ b/libbuild2/cc/msvc.cxx
@@ -264,6 +264,13 @@ namespace build2
           }
           else
             continue;
+
+          // Ignore relative paths. Or maybe we should warn?
+          //
+          if (d.relative ())
+            continue;
+
+          d.normalize ();
         }
         catch (const invalid_path& e)
         {
@@ -271,10 +278,7 @@ namespace build2
                << o << "'";
         }
 
-        // Ignore relative paths. Or maybe we should warn?
-        //
-        if (!d.relative ())
-          r.push_back (move (d));
+        r.push_back (move (d));
       }
     }
 
@@ -295,6 +299,13 @@ namespace build2
             d = dir_path (o, 9, string::npos);
           else
             continue;
+
+          // Ignore relative paths. Or maybe we should warn?
+          //
+          if (d.relative ())
+            continue;
+
+          d.normalize ();
         }
         catch (const invalid_path& e)
         {
@@ -302,10 +313,7 @@ namespace build2
                << o << "'";
         }
 
-        // Ignore relative paths. Or maybe we should warn?
-        //
-        if (!d.relative ())
-          r.push_back (move (d));
+        r.push_back (move (d));
       }
     }
 
@@ -324,7 +332,7 @@ namespace build2
         {
           try
           {
-            r.push_back (dir_path (move (d)));
+            r.push_back (dir_path (move (d)).normalize ());
           }
           catch (const invalid_path&)
           {
diff --git a/libbuild2/cc/pkgconfig.cxx b/libbuild2/cc/pkgconfig.cxx
index 5d4d3ac..d659a2c 100644
--- a/libbuild2/cc/pkgconfig.cxx
+++ b/libbuild2/cc/pkgconfig.cxx
@@ -646,6 +646,7 @@ namespace build2
                          << lflags () << "'" <<
                       info << "while parsing pkg-config --libs " << pc.path;
 
+                  d.normalize ();
                   usrd->push_back (move (d));
                 }
                 catch (const invalid_path& e)
-- 
cgit v1.1