]> git.ipfire.org Git - thirdparty/make.git/commitdiff
* src/variable.c (do_variable_definition) [W32]: Fix bad variable.
authorPaul Smith <psmith@gnu.org>
Sun, 24 Mar 2024 20:47:19 +0000 (16:47 -0400)
committerPaul Smith <psmith@gnu.org>
Thu, 28 Mar 2024 23:08:13 +0000 (19:08 -0400)
src/variable.c

index 635d79d3e50d061990b533de374d853c0c699b84..af3d6a407f9ce8c2e5d7fb32534c9f4606d730aa 100644 (file)
@@ -1638,9 +1638,8 @@ do_variable_definition (const floc *flocp, const char *varname, const char *valu
         {
           v = define_variable_in_set (varname, strlen (varname), default_shell,
                                       origin, flavor == f_recursive,
-                                      (specificity
-                                       ? current_variable_set_list->set
-                                       : NULL),
+                                      (scope == s_global ? NULL
+                                       : current_variable_set_list->set),
                                       flocp);
           no_default_sh_exe = 0;
         }
@@ -1654,9 +1653,8 @@ do_variable_definition (const floc *flocp, const char *varname, const char *valu
             {
               v = define_variable_in_set (varname, strlen (varname), newval,
                                           origin, flavor == f_recursive,
-                                          (specificity
-                                           ? current_variable_set_list->set
-                                           : NULL),
+                                          (scope == s_global ? NULL
+                                           : current_variable_set_list->set),
                                           flocp);
               no_default_sh_exe = 0;
             }