Fix #10717, fix #13284 (#13307)

nim-lang · Feb 4, 2020 · 7cc03b4 · 7cc03b4
1 parent e70294d
commit 7cc03b4
Showing 1 changed file with 17 additions and 4 deletions.
diff --git 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: