From: Jan Beulich Date: Mon, 23 Oct 2023 08:23:14 +0000 (+0200) Subject: libatomic: drop redundant all-multi command X-Git-Tag: basepoints/gcc-15~5285 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0093821426cc22dbe40d46eb763dfc9cf58f8cb1;p=thirdparty%2Fgcc.git libatomic: drop redundant all-multi command ./multilib.am already specifies this same command, and make warns about the earlier one being ignored when seeing the later one. All that needs retaining to still satisfy the preceding comment is the extra dependency. libatomic/ * Makefile.am (all-multi): Drop commands. * Makefile.in: Update accordingly. --- diff --git a/libatomic/Makefile.am b/libatomic/Makefile.am index 3bb32f32ebf7..c0b8dea50378 100644 --- a/libatomic/Makefile.am +++ b/libatomic/Makefile.am @@ -154,12 +154,11 @@ endif libatomic_convenience_la_SOURCES = $(libatomic_la_SOURCES) libatomic_convenience_la_LIBADD = $(libatomic_la_LIBADD) -# Override the automake generated all-multi rule to guarantee that all-multi +# Amend the automake generated all-multi rule to guarantee that all-multi # is not run in parallel with the %_.lo rules which generate $(DEPDIR)/*.Ppo # makefile fragments to avoid broken *.Ppo getting included into the Makefile # when it is reloaded during the build of all-multi. all-multi: $(libatomic_la_LIBADD) - $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do # $(MAKE) # target overrides -include $(tmake_file) diff --git a/libatomic/Makefile.in b/libatomic/Makefile.in index 4164199cf9dc..5a13bc6dfb02 100644 --- a/libatomic/Makefile.in +++ b/libatomic/Makefile.in @@ -897,12 +897,11 @@ vpath % $(strip $(search_path)) %_.lo: Makefile $(LTCOMPILE) $(M_DEPS) $(M_SIZE) $(M_IFUNC) -c -o $@ $(M_SRC) -# Override the automake generated all-multi rule to guarantee that all-multi +# Amend the automake generated all-multi rule to guarantee that all-multi # is not run in parallel with the %_.lo rules which generate $(DEPDIR)/*.Ppo # makefile fragments to avoid broken *.Ppo getting included into the Makefile # when it is reloaded during the build of all-multi. all-multi: $(libatomic_la_LIBADD) - $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do # $(MAKE) # target overrides -include $(tmake_file)