Cygwin: Remove ccwrap

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.

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.

1 files changed, 7 insertions, 9 deletions

diff --git a/winsup/cygwin/configure b/winsup/cygwin/configure
index ce17493..0aa1342 100755
--- a/winsup/cygwin/configure
+++ b/winsup/cygwin/configure
@@ -606,9 +606,7 @@ AS
 AR
 install_host
 all_host
-cygwin_headers
-newlib_headers
-windows_headers
+INCLUDES
 windows_libdir
 CPP
 ac_ct_CXX
@@ -3419,7 +3417,6 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 
 
-addto_CPPFLAGS -nostdinc
 : ${ac_cv_prog_CXX:=$CXX}
 : ${ac_cv_prog_CC:=$CC}
 
@@ -3446,12 +3443,13 @@ else
 	as_fn_error $? "cannot find windows header files" "$LINENO" 5
     fi
 fi
-CC=$ac_cv_prog_CC
-CXX=$ac_cv_prog_CXX
-export CC
-export CXX
-
 
+INCLUDES="-I${srcdir}/../cygwin -I${target_builddir}/winsup/cygwin"
+INCLUDES="${INCLUDES} -isystem ${cygwin_headers}"
+for h in ${newlib_headers}; do
+    INCLUDES="${INCLUDES} -isystem $h"
+done
+INCLUDES="${INCLUDES} -isystem ${windows_headers}"