From 17a84035997c0e9aef7c784dc81e84a591a83177 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Thu, 2 Feb 2023 12:16:43 +0200 Subject: Complete and normalize --default-options path --- bdep/bdep.cxx | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/bdep/bdep.cxx b/bdep/bdep.cxx index 73c1302..02912d0 100644 --- a/bdep/bdep.cxx +++ b/bdep/bdep.cxx @@ -258,8 +258,25 @@ init (const common_options& co, { optional extra; if (o.default_options_specified ()) + { extra = o.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; + } + } + default_options dos ( load_default_options ( nullopt /* sys_dir */, -- cgit v1.1