jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

finish.nim: yet another GCC detection problem fixed

Browse source
This commit is contained in:
Araq 2017-01-29 01:13:37 +01:00
commit 5d79a1fc5b
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
tools/finish.nim
View file

@ -88,9 +88,10 @@ when defined(windows):
if fileExists(gccExe): if fileExists(gccExe):
try: try:
let arch = execProcess(gccExe, ["-dumpmachine"], nil, {poStdErrToStdOut, let arch = execProcess(gccExe, ["-dumpmachine"], nil, {poStdErrToStdOut,
poUsePath}) poUsePath}).strip
when hostCPU == "i386": when hostCPU == "i386":
result = arch.contains("i686-") and not arch.contains("w64") result = (arch.contains("i686-") and not arch.contains("w64")) or
arch == "mingw32"
elif hostCPU == "amd64": elif hostCPU == "amd64":
result = arch.contains("x86_64-") or arch.contains("i686-w64-mingw32") result = arch.contains("x86_64-") or arch.contains("i686-w64-mingw32")
else: else: