drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cygwin: utils: enable -idirafter to fetch Cygwin headers from mingw sources 

Get rid of the last dreaded relative paths pointing to the cygwin dir.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2021-05-26 10:59:03 +02:00
parent 48a76190e8
commit fd84f6cf51
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
winsup/utils/mingw/Makefile.am
View File

@ -29,7 +29,7 @@ cygcheck_SOURCES = \
cygcheck.cc \ cygcheck.cc \
dump_setup.cc \ dump_setup.cc \
path.cc path.cc
cygcheck_CPPFLAGS=-I$(srcdir)/.. cygcheck_CPPFLAGS=-I$(srcdir)/.. -idirafter ${top_srcdir}/cygwin/include
cygcheck_LDADD = -lz -lwininet -lpsapi -lntdll cygcheck_LDADD = -lz -lwininet -lpsapi -lntdll
cygwin_console_helper_SOURCES = cygwin-console-helper.cc cygwin_console_helper_SOURCES = cygwin-console-helper.cc
@ -47,7 +47,7 @@ noinst_PROGRAMS = path-testsuite
path_testsuite_SOURCES = \ path_testsuite_SOURCES = \
path.cc \ path.cc \
testsuite.cc testsuite.cc
path_testsuite_CPPFLAGS=-I$(srcdir)/.. path_testsuite_CPPFLAGS=-I$(srcdir)/.. -idirafter ${top_srcdir}/cygwin/include
path_testsuite_CXXFLAGS = -DTESTSUITE path_testsuite_CXXFLAGS = -DTESTSUITE
TESTS = path-testsuite TESTS = path-testsuite

6
winsup/utils/mingw/cygcheck.cc
View File

@ -20,10 +20,10 @@
#include "path.h" #include "path.h"
#include "wide_path.h" #include "wide_path.h"
#include <getopt.h> #include <getopt.h>
#include "../cygwin/include/cygwin/version.h" #include <cygwin/version.h>
#include "../cygwin/include/sys/cygwin.h" #include <sys/cygwin.h>
#define _NOMNTENT_MACROS #define _NOMNTENT_MACROS
#include "../cygwin/include/mntent.h" #include <mntent.h>
#undef cygwin_internal #undef cygwin_internal
#include "loadlib.h" #include "loadlib.h"

4
winsup/utils/mingw/testsuite.h
View File

@ -7,8 +7,8 @@ Cygwin license. Please consult the file "CYGWIN_LICENSE" for
details. */ details. */
#include "path.h" #include "path.h"
#include "../cygwin/include/cygwin/bits.h" #include <cygwin/bits.h>
#include "../cygwin/include/sys/mount.h" #include <sys/mount.h>
/* This file implements a test harness for the MinGW implementation of /* This file implements a test harness for the MinGW implementation of
POSIX path translation in utils/path.cc. This code is used by strace POSIX path translation in utils/path.cc. This code is used by strace

8
winsup/utils/path.cc
View File

@ -20,11 +20,11 @@ details. */
#include <malloc.h> #include <malloc.h>
#include <wchar.h> #include <wchar.h>
#include "path.h" #include "path.h"
#include "../cygwin/include/cygwin/version.h" #include <cygwin/version.h>
#include "../cygwin/include/cygwin/bits.h" #include <cygwin/bits.h>
#include "../cygwin/include/sys/mount.h" #include <sys/mount.h>
#define _NOMNTENT_MACROS #define _NOMNTENT_MACROS
#include "../cygwin/include/mntent.h" #include <mntent.h>
#ifdef FSTAB_ONLY #ifdef FSTAB_ONLY
#include <sys/cygwin.h> #include <sys/cygwin.h>
#endif #endif