From 38810947f96183501784c7f477291d04629b36dc Mon Sep 17 00:00:00 2001 From: Roland McGrath <roland@hack.frob.com> Date: Fri, 11 Sep 2015 14:16:18 -0700 Subject: [PATCH 13/65] NaCl: Do not install <sys/mtio.h>. (cherry picked from commit d57248f0351b307e17476aa1ef812023025c8fd7) --- ChangeLog | 6 ++++++ sysdeps/nacl/Makefile | 9 +++++++++ 2 files changed, 15 insertions(+) diff --git a/ChangeLog b/ChangeLog index 44809a6..1c5ec45 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2015-09-11 Roland McGrath <roland@hack.frob.com> + + * sysdeps/nacl/Makefile [$(subdir) = misc] (sysdep_headers): + Use 'override' keyword to freeze the value here, preventing + the addition of sys/mtio.h by sysdeps/gnu/Makefile. + 2015-09-04 Roland McGrath <roland@hack.frob.com> [BZ #18921] diff --git a/sysdeps/nacl/Makefile b/sysdeps/nacl/Makefile index 6749a44..1748886 100644 --- a/sysdeps/nacl/Makefile +++ b/sysdeps/nacl/Makefile @@ -132,4 +132,13 @@ ifeq ($(subdir),misc) # sysdeps/.../linux/ directories, but it's still a sysdeps decision to # install it. sysdep_headers += bits/mman-linux.h + +# This defeats sysdeps/gnu/Makefile's addition of sys/mtio.h, which +# we do not want. This is a total kludge, but it seems no worse for +# now than making the sysdeps/gnu/Makefile code conditional on a +# variable we set here. If some sysdeps/.../Makefile that is later +# in the list than sysdeps/gnu needed to add to sysdep_headers, this +# would break it. But sysdeps/gnu is close to last in the list and +# this coming up seems unlikely. +override sysdep_headers := $(sysdep_headers) endif -- 2.7.4
