diff options
| -rw-r--r-- | gcc/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/Makefile.in | 8 | ||||
| -rwxr-xr-x | gcc/configure | 13 | ||||
| -rw-r--r-- | gcc/configure.ac | 8 |
4 files changed, 34 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 193e8e4..536ad7f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2019-11-04 Alexandre Oliva <oliva@adacore.com> + + * configure.ac: Pass --enable-obsolete=* and + --enable-option-checking=* down to build configure, and fail + if it fails. AC_SUBST HAVE_AUTO_BUILD. + * configure: Rebuild. + * Makefile.in [HAVE_AUTO_BUILD] (auto-build.h): New rule. + [HAVE_AUTO_BUILD] (config.status): Depend on auto-build.h. + 2019-11-04 Jozef Lawrynowicz <jozef.l@mittosystems.com> * config.in: Regenerate. diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 035b58f..95f054c 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -1899,6 +1899,14 @@ cstamp-h: config.in config.status CONFIG_FILES= \ LANGUAGES="$(CONFIG_LANGUAGES)" $(SHELL) config.status +# On configurations that require auto-build.h, it is created while +# running configure, so make config.status depend on it, so that +# config.status --recheck runs and updates or creates it. +@HAVE_AUTO_BUILD@auto-build.h: $(srcdir)/configure $(srcdir)/config.gcc +@HAVE_AUTO_BUILD@ @if test -f $@; then echo rerunning config.status to update $@; \ +@HAVE_AUTO_BUILD@ else echo rerunning config.status to update $@; fi +@HAVE_AUTO_BUILD@config.status: auto-build.h + # 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. diff --git a/gcc/configure b/gcc/configure index 9fe0429..6808c23 100755 --- a/gcc/configure +++ b/gcc/configure @@ -774,6 +774,7 @@ LIBINTL_DEP LIBINTL USE_NLS get_gcc_base_ver +HAVE_AUTO_BUILD extra_opt_files extra_modes_file NATIVE_SYSTEM_HEADER_DIR @@ -12208,6 +12209,7 @@ done if test x$host = x$build then build_auto=auto-host.h + HAVE_AUTO_BUILD='# ' else # We create a subdir, then run autoconf in the subdir. # To prevent recursion we set host and build for the new @@ -12230,7 +12232,10 @@ else GMPINC="" CPPFLAGS="${CPPFLAGS} -DGENERATOR_FILE" \ ${realsrcdir}/configure \ --enable-languages=${enable_languages-all} \ - --target=$target_alias --host=$build_alias --build=$build_alias + ${enable_obsolete+--enable-obsolete="$enable_obsolete"} \ + ${enable_option_checking+--enable-option-checking="$enable_option_checking"} \ + --target=$target_alias --host=$build_alias \ + --build=$build_alias || exit # retaining $tempdir # We just finished tests for the build machine, so rename # the file auto-build.h in the gcc directory. @@ -12238,9 +12243,11 @@ else cd .. rm -rf $tempdir build_auto=auto-build.h + HAVE_AUTO_BUILD= fi + tm_file="${tm_file} defaults.h" tm_p_file="${tm_p_file} tm-preds.h" tm_d_file="${tm_d_file} defaults.h" @@ -18926,7 +18933,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 18929 "configure" +#line 18936 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -19032,7 +19039,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 19035 "configure" +#line 19042 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/gcc/configure.ac b/gcc/configure.ac index 0fe4e54..1a0d682 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -1838,6 +1838,7 @@ AC_SUBST(extra_opt_files) if test x$host = x$build then build_auto=auto-host.h + HAVE_AUTO_BUILD='# ' else # We create a subdir, then run autoconf in the subdir. # To prevent recursion we set host and build for the new @@ -1860,7 +1861,10 @@ else GMPINC="" CPPFLAGS="${CPPFLAGS} -DGENERATOR_FILE" \ ${realsrcdir}/configure \ --enable-languages=${enable_languages-all} \ - --target=$target_alias --host=$build_alias --build=$build_alias + ${enable_obsolete+--enable-obsolete="$enable_obsolete"} \ + ${enable_option_checking+--enable-option-checking="$enable_option_checking"} \ + --target=$target_alias --host=$build_alias \ + --build=$build_alias || exit # retaining $tempdir # We just finished tests for the build machine, so rename # the file auto-build.h in the gcc directory. @@ -1868,8 +1872,10 @@ else cd .. rm -rf $tempdir build_auto=auto-build.h + HAVE_AUTO_BUILD= fi AC_SUBST(build_subdir) +AC_SUBST(HAVE_AUTO_BUILD) tm_file="${tm_file} defaults.h" tm_p_file="${tm_p_file} tm-preds.h" |