| Message ID | ec8ebf7a-793d-6aa1-f550-0f1cc0b15ce0@suse.com |
|---|---|
| State | New |
| Headers | show |
| Series | libatomic: drop redundant all-multi command | expand |
On 5/27/2022 2:01 AM, Jan Beulich via Gcc-patches wrote: > ./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/ > 2022-05-XX Jan Beulich <jbeulich@suse.com> > > * Makefile.am (all-multi): Drop commands. > * Makefile.in: Update accordingly. OK for the trunk. jeff
On 27.05.2022 10:01, Jan Beulich wrote: > ./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. Ping? Thanks, Jan > --- a/libatomic/Makefile.am > +++ b/libatomic/Makefile.am > @@ -147,12 +147,11 @@ > 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) > --- a/libatomic/Makefile.in > +++ b/libatomic/Makefile.in > @@ -858,12 +858,11 @@ > %_.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)
On 6/28/2022 12:52 AM, Jan Beulich via Gcc-patches wrote: > On 27.05.2022 10:01, Jan Beulich wrote: >> ./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. > Ping? Weird, I thought I'd acked this already, but I can't find it in my outbox. OK for the trunk. jeff
--- a/libatomic/Makefile.am +++ b/libatomic/Makefile.am @@ -147,12 +147,11 @@ 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) --- a/libatomic/Makefile.in +++ b/libatomic/Makefile.in @@ -858,12 +858,11 @@ %_.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)