github-repos/make
1
0
Fork 0
mirror of https://github.com/mirror/make.git synced 2025-01-15 06:40:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Windows: allow SHELL to be set to a more complex value by checking its

Browse Source 
expansion to see if it's a valid shell, not just the unexpanded value.
This commit is contained in:
Paul Smith 2007-10-13 14:46:04 +00:00
parent 2a23064da5
commit 0b17d143ba
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2007-10-12 Eli Zaretskii <eliz@gnu.org>
* variable.c (do_variable_definition): Allow $(SHELL) to expand to
a more complex value than a simple shell: if it's not a default
shell now then expand it and see if is a default shell then.
2007-10-10 Eli Zaretskii <eliz@gnu.org> 2007-10-10 Eli Zaretskii <eliz@gnu.org>
* dir.c (find_directory) [WINDOWS32]: Remove trailing slashes from * dir.c (find_directory) [WINDOWS32]: Remove trailing slashes from

17
variable.c
View File

@ -1187,9 +1187,26 @@ do_variable_definition (const struct floc *flocp, const char *varname,
flocp); flocp);
no_default_sh_exe = 0; no_default_sh_exe = 0;
} }
else
{
if (alloc_value)
free (alloc_value);
alloc_value = allocated_variable_expand (p);
if (find_and_set_default_shell (alloc_value))
{
v = define_variable_in_set (varname, strlen (varname), p,
origin, flavor == f_recursive,
(target_var
? current_variable_set_list->set
: NULL),
flocp);
no_default_sh_exe = 0;
}
else else
v = lookup_variable (varname, strlen (varname)); v = lookup_variable (varname, strlen (varname));
} }
}
else else
#endif #endif