mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-04-06 14:10:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix rules generating headers in hurd/ and mach/

Browse Source 
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).
This commit is contained in:
Samuel Thibault 2015-09-06 21:07:00 +02:00
parent ccdc039c9d
commit 7f9346e11e
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ChangeLog
View File

@ -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

2
sysdeps/mach/Makefile
View File

@ -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

4
sysdeps/mach/hurd/Makefile
View File

@ -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