diff options
| -rw-r--r-- | ChangeLog | 15 | ||||
| -rw-r--r-- | sysdeps/mach/Makefile | 2 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/Makefile | 4 |
3 files changed, 17 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index f726795da6..32f320199a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,17 @@ -2015-09-06 Manolis Ragkousis <manolis837@gmail.com> +2015-09-06 Samuel Thibault <samuel.thibault@ens-lyon.org> + + Fix rules generating headers in hurd/ and mach/ when initial make call + has subdir= explicitly set. + + * sysdeps/mach/Makefile ($(patsubst + mach%,m\%h%,$(mach-before-compile))): Force subdir to mach when + calling $(MAKE). + * sysdeps/mach/hurd/Makefile ($(patsubst %,$(hurd-objpfx)hurd/%.%,auth + io fs process)): Force subdir to hurd when calling $(MAKE). + ($(common-objpfx)hurd/../mach/RPC_task_get_sampled_pcs.c): Force + subdir to mach when calling $(MAKE). + +2015-09-06 Manolis Ragkousis <manolis837@gmail.com> Check sysheaders when looking for Mach and Hurd headers diff --git a/sysdeps/mach/Makefile b/sysdeps/mach/Makefile index b47cdc6b33..3323e818eb 100644 --- a/sysdeps/mach/Makefile +++ b/sysdeps/mach/Makefile @@ -43,7 +43,7 @@ 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. - $(MAKE) -C $(..)mach mach-before-compile no_deps=t generating=t + $(MAKE) -C $(..)mach subdir=mach mach-before-compile no_deps=t generating=t before-compile += $(mach-before-compile) endif diff --git a/sysdeps/mach/hurd/Makefile b/sysdeps/mach/hurd/Makefile index b528815e0c..244ac4ba30 100644 --- a/sysdeps/mach/hurd/Makefile +++ b/sysdeps/mach/hurd/Makefile @@ -48,13 +48,13 @@ hurd-objpfx = $(common-objpfx)hurd/ 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 - $(MAKE) -C $(..)hurd before-compile no_deps=t + $(MAKE) -C $(..)hurd subdir=hurd before-compile no_deps=t endif # Hurd profil.c includes this file, so give a rule to make it. ifeq ($(subdir),gmon) $(common-objpfx)hurd/../mach/RPC_task_get_sampled_pcs.c: - $(MAKE) -C $(..)mach before-compile no_deps=t + $(MAKE) -C $(..)mach subdir=mach before-compile no_deps=t endif |