diff options
| author | genotrance <dev@genotrance.com> | 2020-02-04 10:38:24 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-04 17:38:24 +0100 |
| commit | 7cc03b43f86eb521aca8347d267b9adc04db4259 (patch) | |
| tree | f8f717a943754fb855b2ad67b6cc1cfbeebc6820 /config | |
| parent | e70294dff2e0393d36a6ae64efb018f3fb5ae2a5 (diff) | |
| download | Nim-7cc03b43f86eb521aca8347d267b9adc04db4259.tar.gz | |
Fix #10717, fix #13284 (#13307)
Diffstat (limited to 'config')
| -rw-r--r-- | config/nim.cfg | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/config/nim.cfg b/config/nim.cfg index 65a1d00d2..1e4bc7b24 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: |