- updated to 4.7.0+branch.diff, release 0.1 for crt bootstrap...

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

diff --git a/gcc-mingw-dirs.patch b/gcc-mingw-dirs.patch
index 38ae22c3fdc92f08f024eb7a7acbb187d2ca7461..bf6551c347d803e3558325b2732d897c12f0a59b 100644 (file)
--- a/gcc-mingw-dirs.patch
+++ b/gcc-mingw-dirs.patch
@@ -1,15 +1,6 @@
---- gcc-4.5.1/gcc/config/i386/mingw32.h.orig   2010-04-27 22:14:19.000000000 +0200
-+++ gcc-4.5.1/gcc/config/i386/mingw32.h        2010-09-26 15:25:06.466741461 +0200
-@@ -66,7 +66,7 @@
- /* Override the standard choice of /usr/include as the default prefix
-    to try when searching for header files.  */
- #undef STANDARD_INCLUDE_DIR
--#define STANDARD_INCLUDE_DIR "/mingw/include"
-+#define STANDARD_INCLUDE_DIR "/include"
- #undef STANDARD_INCLUDE_COMPONENT
- #define STANDARD_INCLUDE_COMPONENT "MINGW"
- 
-@@ -129,7 +129,7 @@
+--- gcc-4.7.0/gcc/config/i386/mingw32.h.orig   2012-02-13 22:46:38.000000000 +0100
++++ gcc-4.7.0/gcc/config/i386/mingw32.h        2012-05-08 22:50:29.438704599 +0200
+@@ -144,7 +144,7 @@
  
  /* Override startfile prefix defaults.  */
  #ifndef STANDARD_STARTFILE_PREFIX_1
@@ -18,21 +9,14 @@
  #endif
  #ifndef STANDARD_STARTFILE_PREFIX_2
  #define STANDARD_STARTFILE_PREFIX_2 ""
---- gcc-4.5.1/gcc/config/i386/t-mingw-w64.orig 2009-04-26 15:50:12.000000000 +0200
-+++ gcc-4.5.1/gcc/config/i386/t-mingw-w64      2010-09-26 15:56:35.711732633 +0200
-@@ -1,5 +1,5 @@
- # Match SYSTEM_INCLUDE_DIR
--NATIVE_SYSTEM_HEADER_DIR = /mingw/include
-+NATIVE_SYSTEM_HEADER_DIR = /include
- 
- MULTILIB_OPTIONS = m64/m32
- MULTILIB_DIRNAMES = 64 32
---- gcc-4.5.1/gcc/config/i386/t-mingw32.orig   2008-09-04 10:25:25.000000000 +0200
-+++ gcc-4.5.1/gcc/config/i386/t-mingw32        2010-09-26 15:57:53.088814500 +0200
-@@ -1,5 +1,5 @@
- # Match SYSTEM_INCLUDE_DIR
--NATIVE_SYSTEM_HEADER_DIR = /mingw/include
-+NATIVE_SYSTEM_HEADER_DIR = /include
- 
- # MinGW-specific parts of LIB_SPEC
- SHLIB_LC = -lmingw32 -lmingwex -lmoldname -lmsvcrt -luser32 -lkernel32 -ladvapi32 -lshell32
+--- 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