public inbox for gcc-cvs@sourceware.org help / color / mirror / Atom feed
From: Gaius Mulley <gaius@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org Subject: [gcc(refs/users/gaius/heads/devel/modula-2)] Bugfix 101389: add missing dependancies to enable parallel builds. Date: Thu, 2 Sep 2021 21:05:45 +0000 (GMT) [thread overview] Message-ID: <20210902210545.48F813857001@sourceware.org> (raw) https://gcc.gnu.org/g:66553ba1e87896f9eb079b797f40d79ca9cb197b commit 66553ba1e87896f9eb079b797f40d79ca9cb197b Author: Gaius Mulley <gaius.mulley@southwales.ac.uk> Date: Thu Sep 2 22:01:14 2021 +0100 Bugfix 101389: add missing dependancies to enable parallel builds. 2021-08-17 Gaius Mulley <gaius.mulley@southwales.ac.uk> gcc/m2/ChangeLog: * Make-lang.in (m2/gm2-gcc/%.o): Add $(generated_files) to the list of dependanies. gm2tools/ChangeLog: * Makefile.in: (Rebuilt). libgm2/ChangeLog: * libm2cor/Makefile.am (libm2cor_la_DEPENDENCIES): Added all .lo objects. * libm2cor/Makefile.in: (Rebuilt). * libm2iso/Makefile.am (libm2iso_la_DEPENDENCIES): Added all .lo objects. * libm2iso/Makefile.in: (Rebuilt). * libm2log/Makefile.am (libm2log_la_DEPENDENCIES): Added all .lo objects. * libm2log/Makefile.in: (Rebuilt). * libm2min/Makefile.am (libm2min_la_DEPENDENCIES): Added all .lo objects. * libm2min/Makefile.in: (Rebuilt). * libm2pim/Makefile.am (libm2pim_la_DEPENDENCIES): Added all .lo objects. * libm2pim/Makefile.in: (Rebuilt). Signed-off-by: Gaius Mulley <gaius.mulley@southwales.ac.uk> Diff: --- gcc/m2/Make-lang.in | 3 ++- libgm2/libm2cor/Makefile.am | 2 +- libgm2/libm2cor/Makefile.in | 2 +- libgm2/libm2iso/Makefile.am | 5 ++++- libgm2/libm2iso/Makefile.in | 7 +++++-- libgm2/libm2log/Makefile.am | 2 +- libgm2/libm2log/Makefile.in | 2 +- libgm2/libm2min/Makefile.am | 2 +- libgm2/libm2min/Makefile.in | 2 +- libgm2/libm2pim/Makefile.am | 2 +- libgm2/libm2pim/Makefile.in | 2 +- 11 files changed, 19 insertions(+), 12 deletions(-) diff --git a/gcc/m2/Make-lang.in b/gcc/m2/Make-lang.in index a4b114aaee9..d9b450128df 100644 --- a/gcc/m2/Make-lang.in +++ b/gcc/m2/Make-lang.in @@ -594,7 +594,8 @@ gm2-gcc/m2except.o : $(srcdir)/m2/gm2-gcc/m2except.c $(CONFIG_H) $(TREE_H) $(RTL m2/gm2-gcc/%.o: $(srcdir)/m2/gm2-gcc/%.c $(BUILD-BOOT-H) $(TIMEVAR_H) m2/gm2config.h $(CONFIG_H) \ $(TREE_H) $(RTL_H) $(TARGET_H) $(PLUGIN_HEADERS) \ - $(srcdir)/flags.h gtype-m2.h m2/gm2config.h + $(srcdir)/flags.h gtype-m2.h m2/gm2config.h \ + $(generated_files) $(COMPILER) -c -g $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION) m2/gm2-lang.o: $(srcdir)/m2/gm2-lang.c $(CONFIG_H) $(TREE_H) $(RTL_H) $(TARGET_H) $(PLUGIN_HEADERS) \ diff --git a/libgm2/libm2cor/Makefile.am b/libgm2/libm2cor/Makefile.am index b0b9a779f5b..afca859b81e 100644 --- a/libgm2/libm2cor/Makefile.am +++ b/libgm2/libm2cor/Makefile.am @@ -112,7 +112,7 @@ libm2cor_la_SOURCES = $(M2MODS) KeyBoardLEDs.c nodist_EXTRA_libm2cor_la_SOURCES = dummy.c ## forces automake to generate the LINK definition libm2cordir = libm2cor -libm2cor_la_DEPENDENCIES = SYSTEM.def +libm2cor_la_DEPENDENCIES = SYSTEM.def $(addsuffix .lo, $(basename $(libm2cor_la_SOURCES))) libm2cor_la_M2FLAGS = -I. -I$(GM2_SRC)/gm2-libs-coroutines -I$(GM2_SRC)/gm2-libs -I$(GM2_SRC)/gm2-libs-iso -fm2-g -g libm2cor_la_LINK = $(LINK) -version-info $(libtool_VERSION) BUILT_SOURCES = SYSTEM.def diff --git a/libgm2/libm2cor/Makefile.in b/libgm2/libm2cor/Makefile.in index 754575ead10..02a6439b120 100644 --- a/libgm2/libm2cor/Makefile.in +++ b/libgm2/libm2cor/Makefile.in @@ -446,7 +446,7 @@ FLAGS_TO_PASS = $(AM_MAKEFLAGS) @BUILD_CORLIB_TRUE@libm2cor_la_SOURCES = $(M2MODS) KeyBoardLEDs.c @BUILD_CORLIB_TRUE@nodist_EXTRA_libm2cor_la_SOURCES = dummy.c ## forces automake to generate the LINK definition @BUILD_CORLIB_TRUE@libm2cordir = libm2cor -@BUILD_CORLIB_TRUE@libm2cor_la_DEPENDENCIES = SYSTEM.def +@BUILD_CORLIB_TRUE@libm2cor_la_DEPENDENCIES = SYSTEM.def $(addsuffix .lo, $(basename $(libm2cor_la_SOURCES))) @BUILD_CORLIB_TRUE@libm2cor_la_M2FLAGS = -I. -I$(GM2_SRC)/gm2-libs-coroutines -I$(GM2_SRC)/gm2-libs -I$(GM2_SRC)/gm2-libs-iso -fm2-g -g @BUILD_CORLIB_TRUE@libm2cor_la_LINK = $(LINK) -version-info $(libtool_VERSION) @BUILD_CORLIB_TRUE@BUILT_SOURCES = SYSTEM.def diff --git a/libgm2/libm2iso/Makefile.am b/libgm2/libm2iso/Makefile.am index 10b5d565b3e..ab46b7f5632 100644 --- a/libgm2/libm2iso/Makefile.am +++ b/libgm2/libm2iso/Makefile.am @@ -183,7 +183,7 @@ libm2iso_la_SOURCES = $(M2MODS) \ wraptime.c RTco.c libm2isodir = libm2iso -libm2iso_la_DEPENDENCIES = SYSTEM.def +libm2iso_la_DEPENDENCIES = SYSTEM.def $(addsuffix .lo, $(basename $(libm2iso_la_SOURCES))) libm2iso_la_CFLAGS = -I. -I.. -I$(GM2_SRC)/gm2-libs-iso -I$(GM2_SRC)/gm2-libs -DBUILD_GM2_LIBS -I@srcdir@/../ -I../../../gcc -I$(GCC_DIR) -I$(GCC_DIR)/../include -I../../libgcc -I$(GCC_DIR)/../libgcc -I$(MULTIBUILDTOP)../../gcc/include libm2iso_la_M2FLAGS = -I. -Ilibm2iso -I$(GM2_SRC)/gm2-libs-iso -I$(GM2_SRC)/gm2-libs -fiso -fextended-opaque -fm2-g -g libm2iso_la_LINK = $(LINK) -version-info $(libtool_VERSION) @@ -204,6 +204,9 @@ SYSTEM.def: Makefile .mod.lo: $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(GM2_FOR_TARGET) -c $(CFLAGS_FOR_TARGET) $(LIBCFLAGS) $(libm2iso_la_M2FLAGS) $< -o $@ +.c.lo: + $(LIBTOOL) --tag=CC --mode=compile $(CC_FOR_TARGET) -c $(CFLAGS_FOR_TARGET) $(LIBCFLAGS) $(libm2iso_la_CFLAGS) $< -o $@ + install-data-local: force mkdir -p $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR) $(INSTALL_DATA) .libs/libm2iso.la $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR) diff --git a/libgm2/libm2iso/Makefile.in b/libgm2/libm2iso/Makefile.in index 7e6a3c08870..2407070a20d 100644 --- a/libgm2/libm2iso/Makefile.in +++ b/libgm2/libm2iso/Makefile.in @@ -547,7 +547,7 @@ FLAGS_TO_PASS = $(AM_MAKEFLAGS) @BUILD_ISOLIB_TRUE@ wraptime.c RTco.c @BUILD_ISOLIB_TRUE@libm2isodir = libm2iso -@BUILD_ISOLIB_TRUE@libm2iso_la_DEPENDENCIES = SYSTEM.def +@BUILD_ISOLIB_TRUE@libm2iso_la_DEPENDENCIES = SYSTEM.def $(addsuffix .lo, $(basename $(libm2iso_la_SOURCES))) @BUILD_ISOLIB_TRUE@libm2iso_la_CFLAGS = -I. -I.. -I$(GM2_SRC)/gm2-libs-iso -I$(GM2_SRC)/gm2-libs -DBUILD_GM2_LIBS -I@srcdir@/../ -I../../../gcc -I$(GCC_DIR) -I$(GCC_DIR)/../include -I../../libgcc -I$(GCC_DIR)/../libgcc -I$(MULTIBUILDTOP)../../gcc/include @BUILD_ISOLIB_TRUE@libm2iso_la_M2FLAGS = -I. -Ilibm2iso -I$(GM2_SRC)/gm2-libs-iso -I$(GM2_SRC)/gm2-libs -fiso -fextended-opaque -fm2-g -g @BUILD_ISOLIB_TRUE@libm2iso_la_LINK = $(LINK) -version-info $(libtool_VERSION) @@ -658,7 +658,7 @@ am--depfiles: $(am__depfiles_remade) @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -.c.lo: +@BUILD_ISOLIB_FALSE@.c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @@ -899,6 +899,9 @@ uninstall-am: uninstall-toolexeclibLTLIBRARIES @BUILD_ISOLIB_TRUE@.mod.lo: @BUILD_ISOLIB_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(GM2_FOR_TARGET) -c $(CFLAGS_FOR_TARGET) $(LIBCFLAGS) $(libm2iso_la_M2FLAGS) $< -o $@ +@BUILD_ISOLIB_TRUE@.c.lo: +@BUILD_ISOLIB_TRUE@ $(LIBTOOL) --tag=CC --mode=compile $(CC_FOR_TARGET) -c $(CFLAGS_FOR_TARGET) $(LIBCFLAGS) $(libm2iso_la_CFLAGS) $< -o $@ + @BUILD_ISOLIB_TRUE@install-data-local: force @BUILD_ISOLIB_TRUE@ mkdir -p $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR) @BUILD_ISOLIB_TRUE@ $(INSTALL_DATA) .libs/libm2iso.la $(DESTDIR)$(inst_libdir)/$(MULTIDIR)$(M2LIBDIR) diff --git a/libgm2/libm2log/Makefile.am b/libgm2/libm2log/Makefile.am index 39f2f8811f9..461612d907b 100644 --- a/libgm2/libm2log/Makefile.am +++ b/libgm2/libm2log/Makefile.am @@ -130,7 +130,7 @@ libm2logdir = libm2log toolexeclib_LTLIBRARIES = libm2log.la libm2log_la_SOURCES = $(M2MODS) Break.c -libm2log_la_DEPENDENCIES = ../libm2pim/SYSTEM.def +libm2log_la_DEPENDENCIES = ../libm2pim/SYSTEM.def $(addsuffix .lo, $(basename $(libm2log_la_SOURCES))) libm2log_la_CFLAGS = -I. -DBUILD_GM2_LIBS -I@srcdir@/../ libm2log_la_M2FLAGS = -I../libm2pim -I$(GM2_SRC)/gm2-libs-pim -I$(GM2_SRC)/gm2-libs -I$(GM2_SRC)/gm2-libs-iso libm2log_la_LINK = $(LINK) -version-info $(libtool_VERSION) diff --git a/libgm2/libm2log/Makefile.in b/libgm2/libm2log/Makefile.in index 86cad2c5c25..39d24444c4e 100644 --- a/libgm2/libm2log/Makefile.in +++ b/libgm2/libm2log/Makefile.in @@ -471,7 +471,7 @@ FLAGS_TO_PASS = $(AM_MAKEFLAGS) @BUILD_LOGLIB_TRUE@libm2logdir = libm2log @BUILD_LOGLIB_TRUE@toolexeclib_LTLIBRARIES = libm2log.la @BUILD_LOGLIB_TRUE@libm2log_la_SOURCES = $(M2MODS) Break.c -@BUILD_LOGLIB_TRUE@libm2log_la_DEPENDENCIES = ../libm2pim/SYSTEM.def +@BUILD_LOGLIB_TRUE@libm2log_la_DEPENDENCIES = ../libm2pim/SYSTEM.def $(addsuffix .lo, $(basename $(libm2log_la_SOURCES))) @BUILD_LOGLIB_TRUE@libm2log_la_CFLAGS = -I. -DBUILD_GM2_LIBS -I@srcdir@/../ @BUILD_LOGLIB_TRUE@libm2log_la_M2FLAGS = -I../libm2pim -I$(GM2_SRC)/gm2-libs-pim -I$(GM2_SRC)/gm2-libs -I$(GM2_SRC)/gm2-libs-iso @BUILD_LOGLIB_TRUE@libm2log_la_LINK = $(LINK) -version-info $(libtool_VERSION) diff --git a/libgm2/libm2min/Makefile.am b/libgm2/libm2min/Makefile.am index 414280bfbc2..70187a460a7 100644 --- a/libgm2/libm2min/Makefile.am +++ b/libgm2/libm2min/Makefile.am @@ -104,7 +104,7 @@ M2MODS = M2RTS.mod SYSTEM.mod libm2mindir = libm2min toolexeclib_LTLIBRARIES = libm2min.la libm2min_la_SOURCES = $(M2MODS) libc.c -libm2min_la_DEPENDENCIES = SYSTEM.def +libm2min_la_DEPENDENCIES = SYSTEM.def $(addsuffix .lo, $(basename $(libm2min_la_SOURCES))) libm2min_la_CFLAGS = -I. -I$(GM2_SRC)/gm2-libs-min -I$(GM2_SRC)/gm2-libs libm2min_la_M2FLAGS = -I. -I$(GM2_SRC)/gm2-libs-min -I$(GM2_SRC)/gm2-libs -fno-exceptions -fno-m2-plugin libm2min_la_LINK = $(LINK) -version-info $(libtool_VERSION) diff --git a/libgm2/libm2min/Makefile.in b/libgm2/libm2min/Makefile.in index 82478458e4f..0dfa927c18f 100644 --- a/libgm2/libm2min/Makefile.in +++ b/libgm2/libm2min/Makefile.in @@ -438,7 +438,7 @@ M2MODS = M2RTS.mod SYSTEM.mod libm2mindir = libm2min toolexeclib_LTLIBRARIES = libm2min.la libm2min_la_SOURCES = $(M2MODS) libc.c -libm2min_la_DEPENDENCIES = SYSTEM.def +libm2min_la_DEPENDENCIES = SYSTEM.def $(addsuffix .lo, $(basename $(libm2min_la_SOURCES))) libm2min_la_CFLAGS = -I. -I$(GM2_SRC)/gm2-libs-min -I$(GM2_SRC)/gm2-libs libm2min_la_M2FLAGS = -I. -I$(GM2_SRC)/gm2-libs-min -I$(GM2_SRC)/gm2-libs -fno-exceptions -fno-m2-plugin libm2min_la_LINK = $(LINK) -version-info $(libtool_VERSION) diff --git a/libgm2/libm2pim/Makefile.am b/libgm2/libm2pim/Makefile.am index ab62e6b74a2..1831a2bfb6a 100644 --- a/libgm2/libm2pim/Makefile.am +++ b/libgm2/libm2pim/Makefile.am @@ -162,7 +162,7 @@ libm2pim_la_SOURCES = $(M2MODS) \ wrapc.c cgetopt.c libm2pimdir = libm2pim -libm2pim_la_DEPENDENCIES = SYSTEM.def +libm2pim_la_DEPENDENCIES = SYSTEM.def $(addsuffix .lo, $(basename $(libm2pim_la_SOURCES))) libm2pim_la_CFLAGS = -I. -I$(GM2_SRC)/gm2-libs -I$(GM2_SRC)/gm2-libs-iso -DBUILD_GM2_LIBS -I@srcdir@/../ libm2pim_la_M2FLAGS = -I. -I$(GM2_SRC)/gm2-libs -I$(GM2_SRC)/gm2-libs-iso -fm2-g -g libm2pim_la_LINK = $(LINK) -version-info $(libtool_VERSION) diff --git a/libgm2/libm2pim/Makefile.in b/libgm2/libm2pim/Makefile.in index 80e9bd6bb5c..3a95f9753ef 100644 --- a/libgm2/libm2pim/Makefile.in +++ b/libgm2/libm2pim/Makefile.in @@ -527,7 +527,7 @@ FLAGS_TO_PASS = $(AM_MAKEFLAGS) @BUILD_PIMLIB_TRUE@ wrapc.c cgetopt.c @BUILD_PIMLIB_TRUE@libm2pimdir = libm2pim -@BUILD_PIMLIB_TRUE@libm2pim_la_DEPENDENCIES = SYSTEM.def +@BUILD_PIMLIB_TRUE@libm2pim_la_DEPENDENCIES = SYSTEM.def $(addsuffix .lo, $(basename $(libm2pim_la_SOURCES))) @BUILD_PIMLIB_TRUE@libm2pim_la_CFLAGS = -I. -I$(GM2_SRC)/gm2-libs -I$(GM2_SRC)/gm2-libs-iso -DBUILD_GM2_LIBS -I@srcdir@/../ @BUILD_PIMLIB_TRUE@libm2pim_la_M2FLAGS = -I. -I$(GM2_SRC)/gm2-libs -I$(GM2_SRC)/gm2-libs-iso -fm2-g -g @BUILD_PIMLIB_TRUE@libm2pim_la_LINK = $(LINK) -version-info $(libtool_VERSION)
next reply other threads:[~2021-09-02 21:05 UTC|newest] Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-09-02 21:05 Gaius Mulley [this message] 2021-09-02 21:05 Gaius Mulley
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210902210545.48F813857001@sourceware.org \ --to=gaius@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).