branch diff updated, release 4.

[packages/crossmingw64-gcc.git] / gcc-mingw-dirs.patch

--- gcc-4.7.1/gcc/config/i386/mingw32.h.orig	2012-09-01 09:00:31.000000000 +0200
+++ gcc-4.7.1/gcc/config/i386/mingw32.h	2012-09-01 09:00:41.647101498 +0200
@@ -144,7 +144,7 @@
 
 /* Override startfile prefix defaults.  */
 #ifndef STANDARD_STARTFILE_PREFIX_1
-#define STANDARD_STARTFILE_PREFIX_1 "/mingw/lib/"
+#define STANDARD_STARTFILE_PREFIX_1 "/lib/"
 #endif
 #ifndef STANDARD_STARTFILE_PREFIX_2
 #define STANDARD_STARTFILE_PREFIX_2 ""
@@ -153,7 +153,7 @@
 /* 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"
+#define NATIVE_SYSTEM_HEADER_DIR "/include"
 
 /* Output STRING, a string representing a filename, to FILE.
    We canonicalize it to be in Unix format (backslashes are replaced
--- gcc-4.7.0/gcc/config.gcc.orig	2012-05-08 22:38:05.000000000 +0200
+++ gcc-4.7.0/gcc/config.gcc	2012-05-08 22:48:39.276921083 +0200
@@ -1465,7 +1465,7 @@
 			tmake_file="${tmake_file} i386/t-mingw-w32"
 			;;
 	esac
-        native_system_header_dir=/mingw/include
+        native_system_header_dir=/include
 	target_gtfiles="\$(srcdir)/config/i386/winnt.c"
 	extra_options="${extra_options} i386/cygming.opt i386/mingw.opt"
 	case ${target} in