From a71f78025343697d2d620c904cdd6b45b6a6569e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20H=C3=B8is=C3=A6ther=20Rasch?= Date: Tue, 8 Aug 2017 12:06:48 +0200 Subject: [PATCH] Added missing C++ options for VCC (#6195) --- config/nim.cfg | 39 ++++++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/config/nim.cfg b/config/nim.cfg index 042a94eaa..2271006c3 100644 --- a/config/nim.cfg +++ b/config/nim.cfg @@ -193,27 +193,40 @@ clang.options.speed = "-O3" clang.options.size = "-Os" # Configuration for the Visual C/C++ compiler: -vcc.exe = "vccexe.exe" -vcc.linkerexe = "vccexe.exe" +vcc.exe = "vccexe.exe" +vcc.cpp.exe = "vccexe.exe" +vcc.linkerexe = "vccexe.exe" +vcc.cpp.linkerexe = "vccexe.exe" # set the options for specific platforms: @if i386: -vcc.options.always = "--platform:x86 /nologo" -vcc.options.linker = "--platform:x86 /nologo /DEBUG /Zi /F33554432" # set the stack size to 32 MiB +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 @elif amd64: -vcc.options.always = "--platform:amd64 /nologo" -vcc.options.linker = "--platform:amd64 /nologo /DEBUG /Zi /F33554432" # set the stack size to 32 MiB +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 @elif arm: -vcc.options.always = "--platform:arm /nologo" -vcc.options.linker = "--platform:arm /nologo /DEBUG /Zi /F33554432" # set the stack size to 32 MiB +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.options.linker = "/nologo /DEBUG /Zi /F33554432" # set the stack size to 32 MiB +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 @end -vcc.options.debug = "/Zi /FS /Od" -vcc.options.speed = "/O2" -vcc.options.size = "/O1" +vcc.options.debug = "/Zi /FS /Od" +vcc.cpp.options.debug = "/Zi /FS /Od /EHsc" +vcc.options.speed = "/O2" +vcc.cpp.options.speed = "/O2 /EHsc" +vcc.options.size = "/O1" +vcc.cpp.options.size = "/O1 /EHsc" # Configuration for the Tiny C Compiler: tcc.options.always = "-w"