# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1520272169 18000
# Node ID 0539bcde3fa8e92a802098f24f6efc0c5267a0e5
# Parent  5e4c8c571527e2d793d39f203cef588f76723312
build-gcc.mk: fix build rules error on non-Windows systems

diff -r 5e4c8c571527 -r 0539bcde3fa8 src/build-gcc.mk
--- a/src/build-gcc.mk	Mon Mar 05 09:07:46 2018 -0500
+++ b/src/build-gcc.mk	Mon Mar 05 12:49:29 2018 -0500
@@ -52,7 +52,8 @@
       fi
     endef
   endif
-  define $(PKG)_BUILD_SYSTEM_RUNTIME
+  define $(PKG)_INSTALL_SYSTEM_HEADERS
+    $($(PKG)_PRE_BUILD)
     # install mingw-w64 headers
     $(call PREPARE_PKG_SOURCE,mingw-w64,$(1))
     mkdir '$(1).headers'
@@ -64,9 +65,9 @@
         --enable-secure-api \
         $(mingw-w64-headers_CONFIGURE_OPTS)
     $(MAKE) -C '$(1).headers' install
-
+  endef
+  define $(PKG)_BUILD_SYSTEM_RUNTIME
     # build standalone gcc
-    $($(PKG)_CONFIGURE)
     $(MAKE) -C '$(1).build' -j '$(JOBS)' all-gcc
     $(MAKE) -C '$(1).build' -j 1 install-gcc
 
@@ -137,11 +138,16 @@
 endef
 
 define $(PKG)_BUILD
-  $($(PKG)_PRE_BUILD)
+  # Windows only.
+  $($(PKG)_INSTALL_SYSTEM_HEADERS)
 
+  # All systems.
+  $($(PKG)_CONFIGURE)
+
+  # Windows only.
   $($(PKG)_BUILD_SYSTEM_RUNTIME)
 
-  # build rest of gcc
+  # Build rest of gcc.
   $(MAKE) -C '$(1).build' -j '$(JOBS)'
   $(MAKE) -C '$(1).build' -j 1 install