github-repos/make
1
0
Fork 0
mirror of https://github.com/mirror/make.git synced 2024-12-27 13:20:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

- Add whitespace to command line invocation in features/recursion

Browse Source 
- Set up .FEATURES with separate calls for optional features, as some
  compilers don't like conditionals inside macro invocations.
This commit is contained in:
Paul Smith 2010-07-01 07:16:00 +00:00
parent 7746a1f74f
commit 97f106fa10
4 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2010-07-01 Paul Smith <psmith@gnu.org>
* main.c (main): Append optional features using separate calls.
Not as efficient but not all compilers allow conditionals inside
macro calls. Fixes Savannah bug #29244.
2010-01-10 Paul Smith <psmith@gnu.org>
* make.h (patheq): Rename strieq() to patheq() for clarity.

23
main.c
View File

@ -1124,20 +1124,25 @@ main (int argc, char **argv, char **envp)
/* define_variable_cname (".TARGETS", "", o_default, 0)->special = 1; */
define_variable_cname (".RECIPEPREFIX", "", o_default, 0)->special = 1;
/* Set up .FEATURES */
/* Set up .FEATURES
We must do this in multiple calls because define_variable_cname() is
a macro and some compilers (MSVC) don't like conditionals in macros. */
define_variable_cname (".FEATURES",
"target-specific order-only second-expansion else-if"
"shortest-stem undefine"
" shortest-stem undefine",
o_default, 0);
#ifndef NO_ARCHIVES
"archives"
do_variable_definition (NILF, ".FEATURES", "archives",
o_default, f_append, 0);
#endif
#ifdef MAKE_JOBSERVER
"jobserver"
do_variable_definition (NILF, ".FEATURES", "jobserver",
o_default, f_append, 0);
#endif
#ifdef MAKE_SYMLINKS
"check-symlink"
do_variable_definition (NILF, ".FEATURES", "check-symlink",
o_default, f_append, 0);
#endif
, o_default, 0);
/* Read in variables from the environment. It is important that this be
done before $(MAKE) is figured out so its definitions will not be
@ -3182,7 +3187,11 @@ die (int status)
directory. Must wait until after remove_intermediates(), or unlinks
of relative pathnames fail. */
if (directory_before_chdir != 0)
chdir (directory_before_chdir);
{
/* If it fails we don't care: shut up GCC. */
int _x;
_x = chdir (directory_before_chdir);
}
log_working_directory (0);
}

7
tests/ChangeLog
View File

@ -1,3 +1,8 @@
2010-07-01 Paul Smith <psmith@gnu.org>
* scripts/features/recursion: Add a space to separate command-line
args. Fixes Savannah bug #29968.
2009-11-12 Boris Kolpackov <boris@codesynthesis.com>
* scripts/features/vpath3: Test for the new library search
@ -6,7 +11,7 @@
2009-10-06 Boris Kolpackov <boris@codesynthesis.com>
* scripts/features/se_explicit: Enable the test for now fixed
savannah bug 25780.
Savannah bug 25780.
2009-10-06 Boris Kolpackov <boris@codesynthesis.com>

2
tests/scripts/features/recursion
View File

@ -16,7 +16,7 @@ last:
@echo MAKELEVEL = $(MAKELEVEL)
@echo THE END
',
('CFLAGS=-O -w' . ($parallel_jobs ? '-j 2' : '')),
('CFLAGS=-O -w' . ($parallel_jobs ? ' -j 2' : '')),
($vos
? "#MAKE#: Entering directory `#PWD#'
make 'CFLAGS=-O' -f #MAKEFILE# foo