From 171b0e3a3b6f5bde0489c0e12c679fcefdeca54f Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Thu, 2 Sep 2021 11:31:25 +0200 Subject: Don't consider aliasing in variable override lookup --- libbuild2/variable.hxx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'libbuild2/variable.hxx') diff --git a/libbuild2/variable.hxx b/libbuild2/variable.hxx index fc446bc..df0cb77 100644 --- a/libbuild2/variable.hxx +++ b/libbuild2/variable.hxx @@ -1555,11 +1555,13 @@ namespace build2 return var != nullptr ? operator[] (*var) : lookup_type (); } - // If typed is false, leave the value untyped even if the variable is. - // The second half of the pair is the storage variable. + // If typed is false, leave the value untyped even if the variable is. If + // aliased is false, then don't consider aliases (used by the variable + // override machinery where the aliases chain is repurrposed for something + // else). The second half of the pair is the storage variable. // pair - lookup (const variable&, bool typed = true) const; + lookup (const variable&, bool typed = true, bool aliased = true) const; pair lookup_to_modify (const variable&, bool typed = true); -- cgit v1.1