procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

c++: -M and modules again

Browse source 
While experimenting with testing module std I noticed that gcc -M broke on
it; it seems I need to set directives_only even sooner than I did in
r15-4219.

gcc/c-family/ChangeLog:

	* c-ppoutput.cc (preprocess_file): Don't set directives_only here.

gcc/cp/ChangeLog:

	* module.cc (module_preprocess_options): Set directives_only here.
This commit is contained in:
Jason Merrill 2024-11-16 15:25:04 -05:00
parent dbfbd3aa2c
commit 3e89a4d513
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gcc/c-family/c-ppoutput.cc
View file

@ -95,7 +95,6 @@ preprocess_file (cpp_reader *pfile)
if (flag_modules)
{
/* For macros from imported headers we need directives_only_cb. */
cpp_get_options (pfile)->directives_only = true;
scan_translation_unit_directives_only (pfile);
}
else

2
gcc/cp/module.cc
View file

@ -21224,6 +21224,8 @@ module_preprocess_options (cpp_reader *reader)
}
auto *opt = cpp_get_options (reader);
opt->module_directives = true;
if (flag_no_output)
opt->directives_only = true;
if (opt->main_search == CMS_none)
opt->main_search = cpp_main_search (flag_header_unit);
}