From 4b4d7a0fd5c21815f4902d6527cb1eaf13b233f7 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Wed, 3 Aug 2016 10:37:12 +0200 Subject: Don't treat absent config values that are saved commented as new --- build2/config/utility.txx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'build2/config/utility.txx') diff --git a/build2/config/utility.txx b/build2/config/utility.txx index 4e6747b..ce9e40f 100644 --- a/build2/config/utility.txx +++ b/build2/config/utility.txx @@ -39,14 +39,14 @@ namespace build2 value& v (root.assign (var) = def_val); v.extra = true; // Default value flag. - n = true; + n = (save_flags & save_commented) == 0; // Absence means default. l = lookup (v, root); org = make_pair (l, 1); // Lookup depth is 1 since it's in root.vars. } // Treat an inherited value that was set to default as new. // else if (l->extra) - n = true; + n = (save_flags & save_commented) == 0; // Absence means default. if (var.override != nullptr) { -- cgit v1.1