summary refs log tree commit diff stats
path: root/tools
diff options
context:
space:
mode:
authorAndreas Rumpf <rumpf_a@web.de>2017-01-26 10:38:50 +0100
committerAndreas Rumpf <rumpf_a@web.de>2017-01-26 11:26:02 +0100
commit5421ec8dae713a37dde2401a8681e2d1f3265b01 (patch)
treed934bb0de0ecaf39c6f2f57be6bee870b94a4a01 /tools
parentb20817c3fb270023c30f65942aa5924cbda634a8 (diff)
downloadNim-5421ec8dae713a37dde2401a8681e2d1f3265b01.tar.gz
finish tool: untested improvements to the GCC detection logic
Diffstat (limited to 'tools')
-rw-r--r--tools/finish.nim4
1 files 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: