From d6a112afe7cd9ade0d06c3128d1f29b6454a7f5c Mon Sep 17 00:00:00 2001 From: Sam James Date: Wed, 14 Aug 2024 13:22:02 +0100 Subject: [PATCH] Makefile.tpl: drop leftover intermodule cruft intermodule supported was dropped in r0-103106-gde6ba7aee152a0 with some remaining bits for Fortran removed in r14-1696-gecc96eb5d2a0e5. Remove some small leftovers. * Makefile.in: Regenerate. * Makefile.tpl (STAGE1_CONFIGURE_FLAGS): Remove --disable-intermodule. --- Makefile.in | 11 ++++------- Makefile.tpl | 11 ++++------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/Makefile.in b/Makefile.in index 34c5550beca..a1a56bb5dd2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -610,14 +610,11 @@ STAGEautofeedback_CONFIGURE_FLAGS = $(STAGE_CONFIGURE_FLAGS) STAGE1_CFLAGS = @stage1_cflags@ STAGE1_CHECKING = @stage1_checking@ STAGE1_LANGUAGES = @stage1_languages@ -# * We force-disable intermodule optimizations, even if -# --enable-intermodule was passed, since the installed compiler -# probably can't handle them. Luckily, autoconf always respects -# the last argument when conflicting --enable arguments are passed. -# * Likewise, we force-disable coverage flags, since the installed -# compiler probably has never heard of them. +# * We force-disable coverage flags, since the installed compiler probably +# has never heard of them. Luckily, autoconf always respects the last +# argument when conflicting --enable arguments are passed. # * We also disable -Wformat, since older GCCs don't understand newer %s. -STAGE1_CONFIGURE_FLAGS = --disable-intermodule $(STAGE1_CHECKING) \ +STAGE1_CONFIGURE_FLAGS = $(STAGE1_CHECKING) \ --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" \ --disable-build-format-warnings diff --git a/Makefile.tpl b/Makefile.tpl index 8f4bf297918..cbb3c6789dc 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -533,14 +533,11 @@ STAGE[+id+]_CONFIGURE_FLAGS = $(STAGE_CONFIGURE_FLAGS) STAGE1_CFLAGS = @stage1_cflags@ STAGE1_CHECKING = @stage1_checking@ STAGE1_LANGUAGES = @stage1_languages@ -# * We force-disable intermodule optimizations, even if -# --enable-intermodule was passed, since the installed compiler -# probably can't handle them. Luckily, autoconf always respects -# the last argument when conflicting --enable arguments are passed. -# * Likewise, we force-disable coverage flags, since the installed -# compiler probably has never heard of them. +# * We force-disable coverage flags, since the installed compiler probably +# has never heard of them. Luckily, autoconf always respects the last +# argument when conflicting --enable arguments are passed. # * We also disable -Wformat, since older GCCs don't understand newer %s. -STAGE1_CONFIGURE_FLAGS = --disable-intermodule $(STAGE1_CHECKING) \ +STAGE1_CONFIGURE_FLAGS = $(STAGE1_CHECKING) \ --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" \ --disable-build-format-warnings