What does ccwrap actually do? ccwrap massages the compiler's standard include directories to remove '/usr/include/w32api', with the intent of allowing it to be overriden by '--with-windows-headers' (See 4c36016b)
I'm not 100% convinced that this is always working as desired, since in some places w32api includes are done using <w32api/something.h>, which will find them via the path /usr/include. Removing ccwrap simplifies Automake-ification, and also permits 'CXX=ccache c++', which doesn't work currently in some place. If this does turn out to be needed, this could also be implemented by constructing the appropriate compiler flags once, rather than on every compiler invocation. For ease of reviewing, this patch series doesn't contain changes to generated files which would be made by an autoreconf. Jon Turney (3): Stop using c++wrap for MinGW-compiled utilities Remove ccwrap Remove --with-windows-{libs,headers} winsup/Makefile.common | 4 +-- winsup/acinclude.m4 | 53 ++++----------------------------- winsup/c++wrap | 6 ---- winsup/ccwrap | 56 ----------------------------------- winsup/configure.ac | 5 ---- winsup/configure.cygwin | 10 ------- winsup/cygserver/Makefile.in | 9 +----- winsup/cygserver/configure.ac | 6 ---- winsup/cygwin/Makefile.in | 17 +++-------- winsup/cygwin/configure.ac | 5 ---- winsup/cygwin/gentls_offsets | 2 +- winsup/utils/Makefile.in | 21 ++----------- winsup/utils/configure.ac | 3 -- 13 files changed, 17 insertions(+), 180 deletions(-) delete mode 100755 winsup/c++wrap delete mode 100755 winsup/ccwrap -- 2.28.0