mirrors/make
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/make.git synced 2024-12-27 23:06:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Fix test suite on DOS (PR/1344)

Browse source 
* Fix target-specific vars bug (PR/1378)
This commit is contained in:
Paul Smith 1999-10-08 06:32:24 +00:00
parent f26e413b12
commit 829f4fd04b
4 changed files with 34 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
1999-10-08 Paul D. Smith <psmith@gnu.org>
* variable.c (initialize_file_variables): Always recurse to
initialize the parent's file variables: the parent might not have
any rules to run so it might not have been initialized before
this--we need this to set up the chain properly for
target-specific variables.
1999-09-23 Paul D. Smith <psmith@gnu.org>
* Version 3.78.1 released.

5
tests/ChangeLog
View file

@ -1,3 +1,8 @@
1999-10-08 Paul D. Smith <psmith@gnu.org>
* scripts/features/targetvars: Add a check for PR/1378:
"Target-specific vars don't inherit correctly"
1999-09-29 Paul D. Smith <psmith@gnu.org>
* test_driver.pl (get_osname): Change $fancy_file_names to

20
tests/scripts/features/targetvars
View file

@ -105,4 +105,24 @@ $answer = "qvar = qvar\nqvar =\n";
&compare_output($answer,&get_logfile(1));
# TEST #8
# For PR/1378: Target-specific vars don't inherit correctly
$makefile2 = &get_tmpfile;
open(MAKEFILE,"> $makefile2");
print MAKEFILE <<'EOF';
foo: FOO = foo
bar: BAR = bar
foo: bar
bar: baz
baz: ; @echo $(FOO) $(BAR)
EOF
close(MAKEFILE);
&run_make_with_options("$makefile2", "", &get_logfile);
$answer = "foo bar\n";
&compare_output($answer, &get_logfile(1));
1;

3
variable.c
View file

@ -238,8 +238,7 @@ initialize_file_variables (file)
l->next = &global_setlist;
else
{
if (file->parent->variables == 0)
initialize_file_variables (file->parent);
initialize_file_variables (file->parent);
l->next = file->parent->variables;
}
}