Hi! I'm aware that incremental builds aren't really supported, but during day-to-day development, they're still useful -- as long as they work. ;-)
A recent change (adding '\$(srcdir)/cp/logic.cc' to 'gtfiles' in
'gcc/cp/config-lang.in') broke things:
[...]/source-gcc/gcc/cp/logic.cc:907:25: fatal error: gt-cp-logic.h: No
such file or directory
compilation terminated.
Makefile:1117: recipe for target 'cp/logic.o' failed
make[2]: *** [cp/logic.o] Error 1
make[2]: *** Waiting for unfinished jobs....
make[2]: Leaving directory '[...]/build-gcc-offload-nvptx-none/gcc'
Makefile:4336: recipe for target 'all-gcc' failed
make[1]: *** [all-gcc] Error 2
make[1]: Leaving directory '[...]/build-gcc-offload-nvptx-none'
Makefile:936: recipe for target 'all' failed
make: *** [all] Error 2
That's because the build machinery didn't notice the
'gcc/cp/config-lang.in' change, and thus files didn't get regenerated;
'gtfiles' are encoded in 'gcc/Makefile', and that's how/where the missing
'gt-cp-logic.h' would be generated.
Please find attached a patch with rationale. OK to commit? If approving
this patch, please respond with "Reviewed-by: NAME <EMAIL>" so that your
effort will be recorded in the commit log, see
<https://gcc.gnu.org/wiki/Reviewed-by>.
Grüße
Thomas
From dae93e7c2ed195fb3d1d6c4ccf0ddb5ef54bf8ee Mon Sep 17 00:00:00 2001 From: Thomas Schwinge <tho...@codesourcery.com> Date: Fri, 25 Oct 2019 12:37:05 +0200 Subject: [PATCH] [build] Properly track GCC language configure fragments The 'gcc/configure' script sources all 'gcc/*/config-lang.in' files, but fails to emit such dependency information into the build machinery. That means, currently, when something gets changed in a 'gcc/*/config-lang.in' file, this is not noticed, and doesn't propagate through the build machinery. Handling of configure fragments is modelled in the same way as it already exists for Makefile fragments. gcc/ * Makefile.in (LANG_CONFIGUREFRAGS): Define. (config.status): Use/depend on it. * configure.ac (all_lang_configurefrags): Track, 'AC_SUBST'. * configure: Regenerate. --- gcc/Makefile.in | 3 ++- gcc/configure | 10 +++++++--- gcc/configure.ac | 5 ++++- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/gcc/Makefile.in b/gcc/Makefile.in index c82858fa93e..bec5d8cf431 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -1122,6 +1122,7 @@ endif # Support for additional languages (other than C). # C can be supported this way too (leave for later). +LANG_CONFIGUREFRAGS = @all_lang_configurefrags@ LANG_MAKEFRAGS = @all_lang_makefrags@ # Used by gcc/jit/Make-lang.in @@ -1902,7 +1903,7 @@ cstamp-h: config.in config.status # Really, really stupid make features, such as SUN's KEEP_STATE, may force # a target to build even if it is up-to-date. So we must verify that # config.status does not exist before failing. -config.status: $(srcdir)/configure $(srcdir)/config.gcc +config.status: $(srcdir)/configure $(srcdir)/config.gcc $(LANG_CONFIGUREFRAGS) @if [ ! -f config.status ] ; then \ echo You must configure gcc. Look at http://gcc.gnu.org/install/ for details.; \ false; \ diff --git a/gcc/configure b/gcc/configure index 9de9ef85f24..84b3578fb2b 100755 --- a/gcc/configure +++ b/gcc/configure @@ -701,6 +701,7 @@ build_exeext all_selected_languages all_languages all_lang_makefrags +all_lang_configurefrags all_gtfiles all_compilers srcdir @@ -18851,7 +18852,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 18854 "configure" +#line 18855 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -18957,7 +18958,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 18960 "configure" +#line 18961 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -29824,7 +29825,8 @@ lang_tree_files= all_languages= all_compilers= all_outputs='Makefile' -# List of language makefile fragments. +# List of language configure and makefile fragments. +all_lang_configurefrags= all_lang_makefrags= # Additional files for gengtype all_gtfiles="$target_gtfiles" @@ -29910,6 +29912,7 @@ do esac $ok || continue + all_lang_configurefrags="$all_lang_configurefrags \$(srcdir)/$gcc_subdir/config-lang.in" all_lang_makefrags="$all_lang_makefrags \$(srcdir)/$gcc_subdir/Make-lang.in" if test -f $srcdir/$gcc_subdir/lang.opt; then lang_opt_files="$lang_opt_files $srcdir/$gcc_subdir/lang.opt" @@ -30061,6 +30064,7 @@ fi + diff --git a/gcc/configure.ac b/gcc/configure.ac index 62f4b2651cc..f89bb43d19c 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -6284,7 +6284,8 @@ lang_tree_files= all_languages= all_compilers= all_outputs='Makefile' -# List of language makefile fragments. +# List of language configure and makefile fragments. +all_lang_configurefrags= all_lang_makefrags= # Additional files for gengtype all_gtfiles="$target_gtfiles" @@ -6372,6 +6373,7 @@ changequote([,])dnl esac $ok || continue + all_lang_configurefrags="$all_lang_configurefrags \$(srcdir)/$gcc_subdir/config-lang.in" all_lang_makefrags="$all_lang_makefrags \$(srcdir)/$gcc_subdir/Make-lang.in" if test -f $srcdir/$gcc_subdir/lang.opt; then lang_opt_files="$lang_opt_files $srcdir/$gcc_subdir/lang.opt" @@ -6479,6 +6481,7 @@ AC_SUBST(subdirs) AC_SUBST(srcdir) AC_SUBST(all_compilers) AC_SUBST(all_gtfiles) +AC_SUBST(all_lang_configurefrags) AC_SUBST(all_lang_makefrags) AC_SUBST(all_languages) AC_SUBST(all_selected_languages) -- 2.17.1
signature.asc
Description: PGP signature
