From 9126f3718d1efce28573e3bb5e0aacfd42d59fb0 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 2 Feb 2023 12:15:48 +0200
Subject: Complete and normalize --default-options path

---
 libbuild2/b-cmdline.cxx | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/libbuild2/b-cmdline.cxx b/libbuild2/b-cmdline.cxx
index 8d78036..b7d0726 100644
--- a/libbuild2/b-cmdline.cxx
+++ b/libbuild2/b-cmdline.cxx
@@ -286,8 +286,25 @@ namespace build2
       {
         optional<dir_path> extra;
         if (ops.default_options_specified ())
+        {
           extra = ops.default_options ();
 
+          // Note that load_default_options() expects absolute and normalized
+          // directory.
+          //
+          try
+          {
+            if (extra->relative ())
+              extra->complete ();
+
+            extra->normalize ();
+          }
+          catch (const invalid_path& e)
+          {
+            fail << "invalid --default-options value " << e.path;
+          }
+        }
+
         // Load default options files.
         //
         default_options<b_options> def_ops (
-- 
cgit v1.1