istp/gray
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Makefile: fix parallel building

Browse Source 
This changes the default rules for ar archives to work correctly under
parallel buildings in GNU make ≥4.4.1.

Incidentally, this also fixes the entire build being sequential for
GNU make <4.4 due to .NOTPARALLEL not supporting prerequisites.
For older versions, timestamps of archive members are not handled
correctly, but that's a relatively minor issue.
This commit is contained in:
Michele Guerini Rocco 2025-03-21 21:03:13 +01:00
parent 09724908d1
commit b673c5889e
Signed by: rnhmjoj
GPG Key ID: BFBAF4C975F76450
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@ -203,11 +203,7 @@ $(LIBDIR)/libgray.so: $(MODULES) | $(LIBDIR)
$(LD) -shared $(LDFLAGS) -o '$@' $^ $(LD) -shared $(LDFLAGS) -o '$@' $^
# GRAY static library # GRAY static library
$(LIBDIR)/libgray.a($(MODULES)): | $(LIBDIR) $(LIBDIR)/libgray.a: $(LIBDIR)/libgray.a($(MODULES)) | $(LIBDIR)
$(LIBDIR)/libgray.a: $(LIBDIR)/libgray.a($(MODULES))
# Don't update archives in parallel, it's unsupported
.NOTPARALLEL: $(LIBDIR)/libgray.a
# GRAY static library when compiling from JETTO # GRAY static library when compiling from JETTO
-include ../include.mk -include ../include.mk
@ -270,6 +266,12 @@ $(OBJDIR)/%.d: %.f90 | $(OBJDIR)
sort -u >> '$@' sort -u >> '$@'
@sed -nE 's@^#include "(.+)"@$(INCDIR)/\1 \\@p' '$<' >> '$@' @sed -nE 's@^#include "(.+)"@$(INCDIR)/\1 \\@p' '$<' >> '$@'
# Accumulate members and update archives all at once
# Note: this replaces the default POSIX rules that
# break under parallel building (make -j)
(%) : % ;
%.a : ; $(AR) $(ARFLAGS) $@ $?
# Load the generated rules # Load the generated rules
include $(DEPS) include $(DEPS)