Formerly main.c.~96~

This commit is contained in:
Roland McGrath 1993-09-20 22:05:19 +00:00
parent 1775c102ad
commit f8c3e52b0f

30
main.c
View file

@ -1649,20 +1649,22 @@ define_makeflags (all, makefile)
*p = '\0'; *p = '\0';
} }
(void) define_variable ("MAKEFLAGS", 9, define_variable ("MAKEFLAGS", 9,
/* On Sun, the value of MFLAGS starts with a `-' but /* On Sun, the value of MFLAGS starts with a `-' but
the value of MAKEFLAGS lacks the `-'. the value of MAKEFLAGS lacks the `-'.
Be compatible with this unless FLAGSTRING starts Be compatible with this unless FLAGSTRING starts
with a long option `--foo', since removing the with a long option `--foo', since removing the
first dash would result in the bogus `-foo'. */ first dash would result in the bogus `-foo'. */
flagstring[1] == '-' ? flagstring : &flagstring[1], flagstring[1] == '-' ? flagstring : &flagstring[1],
/* This used to use o_env, but that lost when a /* This used to use o_env, but that lost when a
makefile defined MAKEFLAGS. Makefiles set makefile defined MAKEFLAGS. Makefiles set
MAKEFLAGS to add switches, but we still want MAKEFLAGS to add switches, but we still want
to redefine its value with the full set of to redefine its value with the full set of
switches. Of course, an override or command switches. Of course, an override or command
definition will still take precedence. */ definition will still take precedence. */
o_file, 0); o_file, 0)
/* Always export MAKEFLAGS. */
->export = v_export;
/* Since MFLAGS is not parsed for flags, there is no reason to /* Since MFLAGS is not parsed for flags, there is no reason to
override any makefile redefinition. */ override any makefile redefinition. */
(void) define_variable ("MFLAGS", 6, flagstring, o_env, 0); (void) define_variable ("MFLAGS", 6, flagstring, o_env, 0);