mirror of
https://git.savannah.gnu.org/git/make.git
synced 2024-12-28 15:57:48 +00:00
Formerly variable.c.~15~
This commit is contained in:
parent
4694e3fe2e
commit
bb90ac7aef
1 changed files with 2 additions and 2 deletions
|
@ -1,5 +1,5 @@
|
||||||
/* Internals of variables for GNU Make.
|
/* Internals of variables for GNU Make.
|
||||||
Copyright (C) 1988, 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
|
Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993 Free Software Foundation, Inc.
|
||||||
This file is part of GNU Make.
|
This file is part of GNU Make.
|
||||||
|
|
||||||
GNU Make is free software; you can redistribute it and/or modify
|
GNU Make is free software; you can redistribute it and/or modify
|
||||||
|
@ -358,7 +358,7 @@ define_automatic_variables ()
|
||||||
v->export = v_export;
|
v->export = v_export;
|
||||||
|
|
||||||
/* Don't let SHELL come from the environment. */
|
/* Don't let SHELL come from the environment. */
|
||||||
if (*v->value == '\0' || (v->origin == o_env))
|
if (*v->value == '\0' || v->origin == o_env || v->origin == o_env_override)
|
||||||
{
|
{
|
||||||
free (v->value);
|
free (v->value);
|
||||||
v->origin = o_file;
|
v->origin = o_file;
|
||||||
|
|
Loading…
Reference in a new issue