Patchwork [mingw] : Fix PR bootstrap/52947

login
register
mail settings
Submitter Kai Tietz
Date July 5, 2012, 5:09 p.m.
Message ID <CAEwic4aU5=D0a=MsLhCe1iVNFS0NghRO2wRkCpCQ9pA5_Nr7_Q@mail.gmail.com>
Download mbox | patch
Permalink /patch/169228/
State New
Headers show

Comments

Kai Tietz - July 5, 2012, 5:09 p.m.
Hello,

This patch fixes an long outstanding bootstrap-issue for mingw-native
targets by using msys' make.
The problem is that this make *auto-magical* modifies POSIX-paths to
DOS-style paths.  This leads to
the issue that two DOS-style paths getting merged together for native build.
This patch simply makes sure that the definition of
NATIVE_SYSTEM_HEADER_DIR remains a POSIX-style
path.

ChangeLog

2012-07-05  Kai Tietz

	PR bootstrap/52947
	* config/i386/mingw32.h (NATIVE_SYSTEM_HEADER_DIR): Define it always
	as "/mingw/include".

Tested for x86_64-w64-mingw32 by Rainer.  I will apply this patch
tomorrow, if there aren't any objections by other windows maintainers.

Regards,
Kai

Patch

Index: mingw32.h
===================================================================
--- mingw32.h	(revision 189294)
+++ mingw32.h	(working copy)
@@ -150,6 +150,11 @@ 
 #define STANDARD_STARTFILE_PREFIX_2 ""
 #endif

+/* For native mingw-version we need to take care that NATIVE_SYSTEM_HEADER_DIR
+   macro contains POSIX-style path.  See bug 52947.  */
+#undef NATIVE_SYSTEM_HEADER_DIR
+#define NATIVE_SYSTEM_HEADER_DIR "/mingw/include"
+
 /* Output STRING, a string representing a filename, to FILE.
    We canonicalize it to be in Unix format (backslashes are replaced
    forward slashes.  */