From 0c60b9f5bb0b4e2afdcb820c40f2b58e4f7d4fbb Mon Sep 17 00:00:00 2001 From: Ganesh Viswanathan Date: Fri, 31 Jan 2020 13:37:05 -0600 Subject: [PATCH] Fix #10717, fix #13284 --- config/nim.cfg | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/config/nim.cfg b/config/nim.cfg index 65a1d00d2220..1e4bc7b2459a 100644 --- a/config/nim.cfg +++ b/config/nim.cfg @@ -85,15 +85,28 @@ path="$lib/pure" @if unix and mingw: # Cross compile for Windows from Linux/OSX using MinGW - os = windows - - i386.windows.gcc.path = "/usr/bin" i386.windows.gcc.exe = "i686-w64-mingw32-gcc" i386.windows.gcc.linkerexe = "i686-w64-mingw32-gcc" + i386.windows.gcc.cpp.exe = "i686-w64-mingw32-g++" + i386.windows.gcc.cpp.linkerexe = "i686-w64-mingw32-g++" - amd64.windows.gcc.path = "/usr/bin" amd64.windows.gcc.exe = "x86_64-w64-mingw32-gcc" amd64.windows.gcc.linkerexe = "x86_64-w64-mingw32-gcc" + amd64.windows.gcc.cpp.exe = "x86_64-w64-mingw32-g++" + amd64.windows.gcc.cpp.linkerexe = "x86_64-w64-mingw32-g++" + + @if macosx: + i386.windows.gcc.path = "/usr/local/bin" + amd64.windows.gcc.path = "/usr/local/bin" + @else: + i386.windows.gcc.path = "/usr/bin" + amd64.windows.gcc.path = "/usr/bin" + @end + + os = windows + + gcc.options.linker = "" + gcc.cpp.options.linker = "" @end @if unix: