diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | sysdeps/nacl/Makefile | 9 |
2 files changed, 15 insertions, 0 deletions
@@ -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-11 Joseph Myers <joseph@codesourcery.com> [BZ #14912] 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 |