# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1392418866 18000
# Node ID 2aaa6f5114348f28850d1afbb69ac7c12b1077e6
# Parent  0c0aea0ab1bbaf920be801d2e01e6099de969771
also use mingw-w64 sources for i686 build

diff -r 0c0aea0ab1bb -r 2aaa6f511434 Makefile.in
--- a/Makefile.in	Fri Feb 14 18:00:12 2014 -0500
+++ b/Makefile.in	Fri Feb 14 18:01:06 2014 -0500
@@ -53,7 +53,7 @@
   ifeq ($(ENABLE_64),yes)
     TARGET := x86_64-w64-mingw32
   else
-    TARGET := i686-pc-mingw32
+    TARGET := i686-w64-mingw32
   endif
 endif
 BUILD_SYSTEM := $(shell tools/config.guess)
diff -r 0c0aea0ab1bb -r 2aaa6f511434 src/build-gcc.mk
--- a/src/build-gcc.mk	Fri Feb 14 18:00:12 2014 -0500
+++ b/src/build-gcc.mk	Fri Feb 14 18:01:06 2014 -0500
@@ -12,11 +12,7 @@
 
 $(PKG)_DEPS := build-cmake build-binutils gcc-cloog gcc-gmp gcc-isl gcc-mpc gcc-mpfr
 ifeq ($(MXE_SYSTEM),mingw)
-  ifeq ($(ENABLE_64),yes)
-    $(PKG)_DEPS += mingw-w64
-  else
-    $(PKG)_DEPS += mingwrt w32api
-  endif
+  $(PKG)_DEPS += mingw-w64
 endif
 
 ifneq ($(BUILD_SHARED),yes)
@@ -78,52 +74,37 @@
         $(shell [ `uname -s` == Darwin ] && echo "LDFLAGS='-Wl,-no_pie'")
 endef
 
-ifeq ($(ENABLE_64),yes)
-  define $(PKG)_BUILD_1
-    # build standalone gcc
-    $($(PKG)_CONFIGURE)
-    $(MAKE) -C '$(1).build' -j '$(JOBS)' all-gcc
-    $(MAKE) -C '$(1).build' -j 1 install-gcc
+define $(PKG)_BUILD
+  # build standalone gcc
+  $($(PKG)_CONFIGURE)
+  $(MAKE) -C '$(1).build' -j '$(JOBS)' all-gcc
+  $(MAKE) -C '$(1).build' -j 1 install-gcc
 
-    # build mingw-w64-crt
-    cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,mingw-w64,$(TAR))
-    mkdir '$(1).crt-build'
-    cd '$(1).crt-build' && '$(1)/$(mingw-w64_SUBDIR)/mingw-w64-crt/configure' \
-        --host='$(TARGET)' \
-        --prefix='$(HOST_PREFIX)'
-    $(MAKE) -C '$(1).crt-build' -j '$(JOBS)' || $(MAKE) -C '$(1).crt-build' -j '$(JOBS)'
-    $(MAKE) -C '$(1).crt-build' -j 1 install
-
-    # build rest of gcc
-    cd '$(1).build'
-    $(MAKE) -C '$(1).build' -j '$(JOBS)'
-    $(MAKE) -C '$(1).build' -j 1 install
+  # build mingw-w64-crt
+  cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,mingw-w64,$(TAR))
+  mkdir '$(1).crt-build'
+  cd '$(1).crt-build' && '$(1)/$(mingw-w64_SUBDIR)/mingw-w64-crt/configure' \
+      --host='$(TARGET)' \
+      --prefix='$(HOST_PREFIX)'
+  $(MAKE) -C '$(1).crt-build' -j '$(JOBS)' || $(MAKE) -C '$(1).crt-build' -j '$(JOBS)'
+  $(MAKE) -C '$(1).crt-build' -j 1 install
 
-    if [ -f $(BUILD_TOOLS_PREFIX)/lib/gcc/$(TARGET)/lib/libgcc_s.a ]; then \
-      mv $(BUILD_TOOLS_PREFIX)/lib/gcc/$(TARGET)/lib/libgcc_s.a $(BUILD_TOOLS_PREFIX)/lib/gcc/$(TARGET)/4.8.2/libgcc_s.a; \
-    fi
-  endef
-else
-  define $(PKG)_BUILD_1
-    $($(PKG)_CONFIGURE)
-    $(MAKE) -C '$(1).build' -j '$(JOBS)'
-    $(MAKE) -C '$(1).build' -j 1 install
-    mkdir -p $(TOP_DIR)/cross-tools/$(HOST_BINDIR)
-    $(MAKE) -C '$(1).build' -j 1 DESTDIR=$(TOP_DIR)/cross-tools install
-  endef
-endif
+  # build rest of gcc
+  cd '$(1).build'
+  $(MAKE) -C '$(1).build' -j '$(JOBS)'
+  $(MAKE) -C '$(1).build' -j 1 install
+
+  if [ -f $(BUILD_TOOLS_PREFIX)/lib/gcc/$(TARGET)/lib/libgcc_s.a ]; then \
+    mv $(BUILD_TOOLS_PREFIX)/lib/gcc/$(TARGET)/lib/libgcc_s.a $(BUILD_TOOLS_PREFIX)/lib/gcc/$(TARGET)/$($(PKG)_VERSION)/libgcc_s.a; \
+  fi
 
-define $(PKG)_BUILD
-    $($(PKG)_BUILD_1)
+  # create pkg-config script
+  if [ '$(MXE_NATIVE_BUILD)' = 'no' ]; then \
+    (echo '#!/bin/sh'; \
+     echo 'PKG_CONFIG_PATH="$$PKG_CONFIG_PATH_$(subst -,_,$(TARGET))" PKG_CONFIG_LIBDIR='\''$(HOST_LIBDIR)/pkgconfig'\'' exec pkg-config $($(PKG)_STATIC_FLAG) "$$@"') \
+             > '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)pkg-config'; \
+    chmod 0755 '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)pkg-config'; \
+  fi
 
-    # create pkg-config script
-    if [ '$(MXE_NATIVE_BUILD)' = 'no' ]; then \
-      (echo '#!/bin/sh'; \
-       echo 'PKG_CONFIG_PATH="$$PKG_CONFIG_PATH_$(subst -,_,$(TARGET))" PKG_CONFIG_LIBDIR='\''$(HOST_LIBDIR)/pkgconfig'\'' exec pkg-config $($(PKG)_STATIC_FLAG) "$$@"') \
-               > '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)pkg-config'; \
-      chmod 0755 '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)pkg-config'; \
-    fi
-
-    $($(PKG)_POST_BUILD)
+  $($(PKG)_POST_BUILD)
 endef
-