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

[SV 61218] Ensure MAKEFLAGS is expanded even with -e

Browse Source 
If -e was given we weren't expanding MAKEFLAGS before passing it
through the environment to jobs: we don't expand variables we
receive from the environment and when -e is given we set the
origin of MAKEFLAGS to "environment override".  Check for MAKEFLAGS
specifically, which seems like a hack but I don't have a better
idea offhand.

* src/main.c (main): Drive-by: use o_default for MAKEOVERRIDES.
* src/variable.c (target_environment): Always expand MAKEFLAGS
regardless of the origin type.
* tests/scripts/options/dash-e: Create a test.
This commit is contained in:
Paul Smith 2023-01-08 16:40:55 -05:00
parent 11444fb001
commit a275f4e9ab
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main.c
View File

@ -1920,7 +1920,7 @@ main (int argc, char **argv, char **envp)
allow the user's setting of MAKEOVERRIDES to affect MAKEFLAGS, so
a reference to this hidden variable is written instead. */
define_variable_cname ("MAKEOVERRIDES", "${-*-command-variables-*-}",
o_env, 1);
o_default, 1);
#ifdef VMS
vms_export_dcl_symbol ("MAKEOVERRIDES", "${-*-command-variables-*-}");
#endif

5
src/variable.c
View File

@ -1114,8 +1114,9 @@ target_environment (struct file *file, int recursive)
/* If V is recursively expanded and didn't come from the environment,
expand its value. If it came from the environment, it should
go back into the environment unchanged. */
if (v->recursive && v->origin != o_env && v->origin != o_env_override)
go back into the environment unchanged... except MAKEFLAGS. */
if (v->recursive && ((v->origin != o_env && v->origin != o_env_override)
|| streq (v->name, MAKEFLAGS_NAME)))
value = cp = recursively_expand_for_file (v, file);
/* If this is the SHELL variable remember we already added it. */

15
tests/scripts/options/dash-e
View File

@ -1,8 +1,6 @@
# -*-perl-*-
$description = "The following test creates a makefile to ...";
$details = "";
$description = "Test the -e (environment overrides) option";
$ENV{GOOGLE} = 'boggle';
@ -12,4 +10,15 @@ all:; @echo "$(GOOGLE)"
!,
'-e', "boggle\n");
# Ensure variables set on the command line have the origin correct
# See SV 61218
run_make_test(q!
$(info FOO [$(origin FOO)]: $(value FOO))
all: ;
recurse: ; @$(MAKE) -f #MAKEFILE#
!,
'-e --no-print-directory FOO=1 recurse',
"FOO [command line]: 1\nFOO [command line]: 1\n#MAKE#[1]: 'all' is up to date.");
1;