summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2016-03-20 16:44:44 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2016-03-20 16:44:44 +0100
commitfe43d0f464fa97f0cb4c08f3303f6a7aadd638f9 (patch)
tree7643c683bf9d2e870f9a675a415b5edb158a9212
parenta64e3aadbf99dd99baab4b3b650eb6be68b3a4aa (diff)
downloadglibc-fe43d0f464fa97f0cb4c08f3303f6a7aadd638f9.tar.gz
hurd: Break errnos.d / libc-modules.h dependency loop
Generating errnos.d does not actually need libc-modules.h. * sysdeps/mach/hurd/Makefile ($(common-objpfx)errnos.d): Strip "-include $(common-objpfx)libc-modules.h" from CPPFLAGS, and do not depend on libc-modules.h,
-rw-r--r--ChangeLog6
-rw-r--r--sysdeps/mach/hurd/Makefile6
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ad37067139..ce46c6b496 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-03-20 Samuel Thibault <samuel.thibault@ens-lyon.org>
+
+ * sysdeps/mach/hurd/Makefile ($(common-objpfx)errnos.d): Strip
+ "-include $(common-objpfx)libc-modules.h" from CPPFLAGS, and do not
+ depend on libc-modules.h,
+
2016-03-17 Joseph Myers <joseph@codesourcery.com>
* sysdeps/unix/sysv/linux/kernel-features.h (__ASSUME_EVENTFD2):
diff --git a/sysdeps/mach/hurd/Makefile b/sysdeps/mach/hurd/Makefile
index 3845c57c14..cfaeed3045 100644
--- a/sysdeps/mach/hurd/Makefile
+++ b/sysdeps/mach/hurd/Makefile
@@ -79,9 +79,11 @@ endef
# the headers we want to search for Mach error codes, listed above (and
# incidentally, all other headers those include).
-include $(common-objpfx)errnos.d
-$(common-objpfx)errnos.d: $(mach-errnos-deps) libc-modules.h
+$(common-objpfx)errnos.d: $(mach-errnos-deps)
$(mach-errno-h) | \
- $(CC) $(CFLAGS) $(CPPFLAGS) -M -x c - | \
+ $(CC) $(CFLAGS) \
+ $(subst -include $(common-objpfx)libc-modules.h,,$(CPPFLAGS)) \
+ -M -x c - | \
sed $(sed-remove-objpfx) -e 's,- *:,mach-errnos-deps :=,' \
-e 's, \.\./, $(..),g' > $@t
mv -f $@t $@