summary refs log tree commit diff stats
path: root/config
diff options
context:
space:
mode:
authorTomohiro <gpuppur@gmail.com>2019-03-04 20:15:07 +0900
committerAndreas Rumpf <rumpf_a@web.de>2019-03-04 12:15:07 +0100
commitdf3d08b58b172dae6fe1f2ecb72db288166d211d (patch)
tree0ef4a783a578de181e1529609974c0769e4cd21c /config
parentbf1f4b914b3481f40c08e3282f3ed614b11f8115 (diff)
downloadNim-df3d08b58b172dae6fe1f2ecb72db288166d211d.tar.gz
Fixes #10387 (#10743)
Diffstat (limited to 'config')
-rw-r--r--config/nim.cfg29
1 files changed, 21 insertions, 8 deletions
diff --git a/config/nim.cfg b/config/nim.cfg
index c3e0823b6..25c4eccba 100644
--- a/config/nim.cfg
+++ b/config/nim.cfg
@@ -256,16 +256,29 @@ vcc.options.always =      "/nologo"
 vcc.cpp.options.always %=  "${vcc.options.always} /EHsc"
 vcc.options.linker = "/nologo /DEBUG /Zi /F33554432" # set the stack size to 32 MiB
 vcc.cpp.options.linker %=  "${vcc.options.linker}"
+
+# set the options for cross compiles. (hostCPU != targetCPU)
+i386.windows.vcc.options.always = "--platform:x86 /nologo"
+i386.windows.vcc.cpp.options.always = "--platform:x86 /nologo /EHsc"
+i386.windows.vcc.options.linker = "--platform:x86 /nologo /DEBUG /Zi /F33554432" # set the stack size to 32 MiB
+i386.windows.vcc.cpp.options.linker = "--platform:x86 /nologo /DEBUG /Zi /F33554432" # set the stack size to 32 MiB
+
+amd64.windows.vcc.options.always = "--platform:amd64 /nologo"
+amd64.windows.vcc.cpp.options.always = "--platform:amd64 /nologo /EHsc"
+amd64.windows.vcc.options.linker = "--platform:amd64 /nologo /DEBUG /Zi /F33554432" # set the stack size to 32 MiB
+amd64.windows.vcc.cpp.options.linker = "--platform:amd64 /nologo /DEBUG /Zi /F33554432" # set the stack size to 32 MiB
+
+# set the options for native compiles. (hostCPU == targetCPU)
 @if i386:
-  vcc.options.always = "--platform:x86 /nologo"
-  vcc.cpp.options.always = "--platform:x86 /nologo /EHsc"
-  vcc.options.linker = "--platform:x86 /nologo /DEBUG /Zi /F33554432" # set the stack size to 32 MiB
-  vcc.cpp.options.linker = "--platform:x86 /nologo /DEBUG /Zi /F33554432" # set the stack size to 32 MiB
+  vcc.options.always %= "${i386.windows.vcc.options.always}"
+  vcc.cpp.options.always %= "${i386.windows.vcc.cpp.options.always}"
+  vcc.options.linker %= "${i386.windows.vcc.options.linker}"
+  vcc.cpp.options.linker %= "${i386.windows.vcc.cpp.options.linker}"
 @elif amd64:
-  vcc.options.always = "--platform:amd64 /nologo"
-  vcc.cpp.options.always = "--platform:amd64 /nologo /EHsc"
-  vcc.options.linker = "--platform:amd64 /nologo /DEBUG /Zi /F33554432" # set the stack size to 32 MiB
-  vcc.cpp.options.linker = "--platform:amd64 /nologo /DEBUG /Zi /F33554432" # set the stack size to 32 MiB
+  vcc.options.always %= "${amd64.windows.vcc.options.always}"
+  vcc.cpp.options.always %= "${amd64.windows.vcc.cpp.options.always}"
+  vcc.options.linker %= "${amd64.windows.vcc.options.linker}"
+  vcc.cpp.options.linker %= "${amd64.windows.vcc.cpp.options.linker}"
 @elif arm:
   vcc.options.always = "--platform:arm /nologo"
   vcc.cpp.options.always = "--platform:arm /nologo /EHsc"