# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1392590973 18000
# Node ID 1b350761007fb5e6bf96515c83827b5ccc0b6dff
# Parent  9bc3862c20911296d30e8b99922e21ca2fb98ec5
allow native-gcc build to succeed

diff -r 9bc3862c2091 -r 1b350761007f src/build-binutils.mk
--- a/src/build-binutils.mk	Fri Feb 14 18:01:52 2014 -0500
+++ b/src/build-binutils.mk	Sun Feb 16 17:49:33 2014 -0500
@@ -42,12 +42,13 @@
         --target='$(TARGET)' \
         --build='$(BUILD_SYSTEM)' \
         --prefix='$(BUILD_TOOLS_PREFIX)' \
+        --libdir='$(BUILD_TOOLS_PREFIX)/lib' \
         --with-gcc \
         --with-gnu-ld \
         --with-gnu-as \
         --disable-nls \
         --disable-multilib \
-        --with-sysroot='$(BUILD_TOOLS_PREFIX)' \
+        --with-sysroot='$(HOST_PREFIX)' \
         $(ENABLE_SHARED_OR_STATIC) \
         --disable-werror
     $(MAKE) -C '$(1)' -j '$(JOBS)'
diff -r 9bc3862c2091 -r 1b350761007f src/build-gcc.mk
--- a/src/build-gcc.mk	Fri Feb 14 18:01:52 2014 -0500
+++ b/src/build-gcc.mk	Sun Feb 16 17:49:33 2014 -0500
@@ -29,7 +29,8 @@
     --disable-nls \
     --without-x \
     --disable-win32-registry \
-    --enable-threads=win32
+    --enable-threads=win32 \
+    --with-native-system-header-dir='/include'
   ifneq ($(ENABLE_64),yes)
     $(PKG)_SYSDEP_CONFIGURE_OPTIONS += \
       --disable-sjlj-exceptions
@@ -59,6 +60,7 @@
         --prefix='$(BUILD_TOOLS_PREFIX)' \
         --enable-languages='c,c++,fortran' \
         --disable-multilib \
+        --with-sysroot='$(HOST_PREFIX)' \
         $($(PKG)_SYSDEP_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --disable-libgomp \
@@ -85,7 +87,9 @@
   mkdir '$(1).crt-build'
   cd '$(1).crt-build' && '$(1)/$(mingw-w64_SUBDIR)/mingw-w64-crt/configure' \
       --host='$(TARGET)' \
-      --prefix='$(HOST_PREFIX)'
+      --prefix='$(HOST_PREFIX)' \
+      --with-sysroot='$(HOST_PREFIX)' \
+      $(ENABLE_SHARED_OR_STATIC)
   $(MAKE) -C '$(1).crt-build' -j '$(JOBS)' || $(MAKE) -C '$(1).crt-build' -j '$(JOBS)'
   $(MAKE) -C '$(1).crt-build' -j 1 install
 
diff -r 9bc3862c2091 -r 1b350761007f src/native-gcc.mk
--- a/src/native-gcc.mk	Fri Feb 14 18:01:52 2014 -0500
+++ b/src/native-gcc.mk	Sun Feb 16 17:49:33 2014 -0500
@@ -12,11 +12,7 @@
 
 $(PKG)_DEPS := native-binutils cloog gmp isl mpc 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)
 $(PKG)_STATIC_FLAG := --static
@@ -29,7 +25,7 @@
     --without-x \
     --disable-win32-registry \
     --enable-threads=win32 \
-    --with-native-system-header-dir=$(HOST_PREFIX)/include
+    --with-native-system-header-dir='$(HOST_PREFIX)/include'
   ifneq ($(ENABLE_64),yes)
     $(PKG)_SYSDEP_CONFIGURE_OPTIONS += \
       --disable-sjlj-exceptions