Patch to improve mingw include file handling
Stan Cox
scox@cygnus.com
Fri Apr 2 14:35:00 GMT 1999
Find the mingw include files before the cygwin include files whenever
-mno-cygwin is specified.
Fri Apr 2 14:35:45 1999 Stan Cox <scox@cygnus.com>
* config/i386/cygwin.h (CPP_SPEC): Use mingw_include_path instead
of a hardcoded path for -mno-cygwin.
(mingw_include_path): New.
Index: config/i386/cygwin.h
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/config/i386/cygwin.h,v
retrieving revision 1.3
diff -u -p -u -r1.3 cygwin.h
--- config/i386/cygwin.h 1999/02/09 23:52:03 1.3
+++ config/i386/cygwin.h 1999/04/02 22:25:41
@@ -86,8 +86,23 @@ Boston, MA 02111-1307, USA. */
#undef CPP_SPEC
#define CPP_SPEC "-remap %(cpp_cpu) %{posix:-D_POSIX_SOURCE} \
%{!mno-cygwin:-D__CYGWIN32__ -D__CYGWIN__} \
- %{mno-cygwin:-iwithprefixbefore include/mingw32 -D__MINGW32__=0.2}"
+ %{mno-cygwin:-iwithprefixbefore \
+ ../../../../%(mingw_include_path)/include/mingw32 -D__MINGW32__=0.2}"
+/* This macro defines names of additional specifications to put in the specs
+ that can be used in various specifications like CC1_SPEC. Its definition
+ is an initializer with a subgrouping for each command option.
+
+ Each subgrouping contains a string constant, that defines the
+ specification name, and a string constant that used by the GNU CC driver
+ program.
+
+ Do not define this macro if it does not need to do anything. */
+
+#undef SUBTARGET_EXTRA_SPECS
+#define SUBTARGET_EXTRA_SPECS \
+ { "mingw_include_path", DEFAULT_TARGET_MACHINE }
+
/* We have to dynamic link to get to the system DLLs. All of libc, libm and
the Unix stuff is in cygwin.dll. The import library is called
'libcygwin.a'. For Windows applications, include more libraries, but
@@ -98,8 +113,8 @@ Boston, MA 02111-1307, USA. */
#define LIB_SPEC "%{pg:-lgmon} \
%{!mno-cygwin:-lcygwin} \
%{mno-cygwin:-lmingw32 -lmoldname -lcrtdll} \
- %{mwindows:-luser32 -lgdi32 -lcomdlg32} \
- -lkernel32 -ladvapi32 -lshell32"
+ %{mwindows:-lgdi32 -lcomdlg32} \
+ -luser32 -lkernel32 -ladvapi32 -lshell32"
#define LINK_SPEC "%{mwindows:--subsystem windows} \
%{mdll:--dll -e _DllMainCRTStartup@12}"
More information about the Gcc-patches
mailing list