From 5421ec8dae713a37dde2401a8681e2d1f3265b01 Mon Sep 17 00:00:00 2001
From: Andreas Rumpf <rumpf_a@web.de>
Date: Thu, 26 Jan 2017 10:38:50 +0100
Subject: [PATCH] finish tool: untested improvements to the GCC detection logic

---
 tools/finish.nim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/finish.nim b/tools/finish.nim
index 73d4ae9bc..00bc2458c 100644
--- a/tools/finish.nim
+++ b/tools/finish.nim
@@ -90,9 +90,9 @@ when defined(windows):
         let arch = execProcess(gccExe, ["-dumpmachine"], nil, {poStdErrToStdOut,
                                                                poUsePath})
         when hostCPU == "i386":
-          result = arch.contains("i686-")
+          result = arch.contains("i686-") and not arch.contains("w64")
         elif hostCPU == "amd64":
-          result = arch.contains("x86_64-")
+          result = arch.contains("x86_64-") or arch.contains("i686-w64-mingw32")
         else:
           {.error: "Unknown CPU for Windows.".}
       except OSError, IOError: