qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NaCl: Do not install <sys/mtio.h>.

This commit is contained in:
Roland McGrath 2015-09-11 14:16:18 -07:00
parent de071d199a
commit d57248f035
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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> 2015-09-11 Joseph Myers <joseph@codesourcery.com>
[BZ #14912] [BZ #14912]

9
sysdeps/nacl/Makefile
View File

@ -132,4 +132,13 @@ ifeq ($(subdir),misc)
# sysdeps/.../linux/ directories, but it's still a sysdeps decision to # sysdeps/.../linux/ directories, but it's still a sysdeps decision to
# install it. # install it.
sysdep_headers += bits/mman-linux.h 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 endif