Fix parallel build of before-compile targets.

* sysdeps/mach/Makefile ($(patsubst
mach%,m\%h%,$(mach-before-compile))): Move rule to dedicated
mach-before-compile target.
* sysdeps/mach/hurd/Makefile ($(patsubst %,$(hurd-objpfx)hurd/%.%,auth
io fs process)): Move rule to dedicated hurd-before-compile target.
This commit is contained in:
Samuel Thibault 2015-09-08 01:26:01 +02:00
parent 7f9346e11e
commit 697ed91ca9
3 changed files with 16 additions and 3 deletions

View File

@ -1,3 +1,13 @@
2015-09-08 Samuel Thibault <samuel.thibault@ens-lyon.org>
Fix parallel build of before-compile targets.
* sysdeps/mach/Makefile ($(patsubst
mach%,m\%h%,$(mach-before-compile))): Move rule to dedicated
mach-before-compile target.
* sysdeps/mach/hurd/Makefile ($(patsubst %,$(hurd-objpfx)hurd/%.%,auth
io fs process)): Move rule to dedicated hurd-before-compile target.
2015-09-06 Samuel Thibault <samuel.thibault@ens-lyon.org>
Fix rules generating headers in hurd/ and mach/ when initial make call

View File

@ -42,7 +42,9 @@ mach-before-compile := $(mach-objpfx)mach-shortcuts.h \
ifneq (mach,$(subdir))
# This patsubst generates patterns like `m%h-shortcuts.h', which are damn
# likely to match just the corresponding particular file we want.
$(patsubst mach%,m\%h%,$(mach-before-compile)): # Run only if doesn't exist.
$(patsubst mach%,m\%h%,$(mach-before-compile)): mach-before-compile # Run only if doesn't exist.
.PHONY: mach-before-compile
mach-before-compile:
$(MAKE) -C $(..)mach subdir=mach mach-before-compile no_deps=t generating=t
before-compile += $(mach-before-compile)

View File

@ -46,8 +46,9 @@ hurd-objpfx = $(common-objpfx)hurd/
# These are all the generated headers that <hurd.h> includes.
before-compile += $(patsubst %,$(hurd-objpfx)hurd/%.h,auth io fs process)
$(patsubst %,$(hurd-objpfx)hurd/%.%,auth io fs process): \
$(common-objpfx)mach/mach-shortcuts.h
$(patsubst %,$(hurd-objpfx)hurd/%.%,auth io fs process): hurd-before-compile \
.PHONY: hurd-before-compile
hurd-before-compile: $(common-objpfx)mach/mach-shortcuts.h
$(MAKE) -C $(..)hurd subdir=hurd before-compile no_deps=t
endif