summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorcooldome <cdome@bk.ru>2019-04-16 07:47:31 +0100
committerAndreas Rumpf <rumpf_a@web.de>2019-04-16 08:47:31 +0200
commit374a85bb9cf952cd3ad65f04f1aef75cc321ad22 (patch)
tree8e2a1f2c3b88d4dc55b0746381c555e48fa76551
parent41ee3538df7fcb0e006649e3d0881edbdefb65c7 (diff)
downloadNim-374a85bb9cf952cd3ad65f04f1aef75cc321ad22.tar.gz
Review of vcc command line arguments (#11003)
* fixes #11000

* trigger commit

* Trigger build
-rw-r--r--config/nim.cfg43
1 files changed, 7 insertions, 36 deletions
diff --git a/config/nim.cfg b/config/nim.cfg
index 25c4eccba..2eda9a56a 100644
--- a/config/nim.cfg
+++ b/config/nim.cfg
@@ -246,51 +246,22 @@ vcc.cpp.exe = "vccexe.exe"
 vcc.linkerexe = "vccexe.exe"
 vcc.cpp.linkerexe = "vccexe.exe"
 
-# set the options for specific platforms:
-vcc.options.always =      "/nologo"
-@if release:
-  # no debug symbols in release builds
-@else:
-  vcc.options.always %= "${vcc.options.always} /Z7" # Get VCC to output full debug symbols in the obj file
-@end
-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
+i386.windows.vcc.options.always = "/nologo --platform:x86"
+amd64.windows.vcc.options.always = "/nologo --platform:amd64"
+arm.windows.vcc.options.always = "/nologo --platform:arm"
 
-# set the options for native compiles. (hostCPU == targetCPU)
+# set the options for specific platforms:
 @if i386:
   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 %= "${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"
-  vcc.options.linker = "--platform:arm /nologo /DEBUG /Zi /F33554432" # set the stack size to 32 MiB
-  vcc.cpp.options.linker = "--platform:arm /nologo /DEBUG /Zi /F33554432" # set the stack size to 32 MiB
-@else:
-  vcc.options.always = "/nologo"
-  vcc.cpp.options.always = "/nologo /EHsc"
-  vcc.options.linker = "/nologo /DEBUG /Zi /F33554432" # set the stack size to 32 MiB
-  vcc.cpp.options.linker = "/nologo /DEBUG /Zi /F33554432" # set the stack size to 32 MiB
+  vcc.options.always %= "${arm.windows.vcc.options.always}"
 @end
 
+vcc.cpp.options.always = "/EHsc"
+vcc.options.linker.always = "/F33554432" # set the stack size to 32 MiB
 vcc.options.debug = "/Zi /FS /Od"
 vcc.cpp.options.debug = "/Zi /FS /Od"
 vcc.options.speed = "/O2"