GNU C Library master sources branch master updated. glibc-2.22-217-g7f9346e

[sthibaul at sourceware dot org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  7f9346e11e160d0157786c1e3761453c7e0f99c4 (commit)
      from  ccdc039c9d1f7b2efe23a156b2c72a50e64453e4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=7f9346e11e160d0157786c1e3761453c7e0f99c4

commit 7f9346e11e160d0157786c1e3761453c7e0f99c4
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date:   Sun Sep 6 21:07:00 2015 +0200

    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).

diff --git a/ChangeLog b/ChangeLog
index f726795..32f3201 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 b47cdc6..3323e81 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 b528815..244ac4b 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
 
 

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                  |   15 ++++++++++++++-
 sysdeps/mach/Makefile      |    2 +-
 sysdeps/mach/hurd/Makefile |    4 ++--
 3 files changed, 17 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources