From 051804816a07082393c6ee8c4d684566832284d1 Mon Sep 17 00:00:00 2001
From: Joshua Warner <joshua.warner@readytalk.com>
Date: Thu, 17 Jul 2014 12:22:24 -0600
Subject: [PATCH] statically link libstdc++ to type-generator on windows (for
 real, this time!)

---
 makefile | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/makefile b/makefile
index 23b6d49e18..2a763ecb71 100755
--- a/makefile
+++ b/makefile
@@ -754,10 +754,6 @@ openjdk-extra-cflags += $(classpath-extra-cflags)
 
 find-tool = $(shell if ( command -v "$(1)$(2)" >/dev/null ); then (echo "$(1)$(2)") else (echo "$(2)"); fi)
 
-ifeq ($(build-platform),windows)
-	static-on-windows = -static
-endif
-
 ifeq ($(platform),windows)
 	target-format = pe
 
@@ -787,6 +783,7 @@ ifeq ($(platform),windows)
 		strip = $(prefix)strip --strip-all
 	else
 		build-system = windows
+		static-on-windows = -static
 		common-cflags += "-I$(JAVA_HOME)/include/win32"
 		build-cflags = $(common-cflags) -I$(src) -I$(inc) -mthreads
 		openjdk-extra-cflags =