summaryrefslogtreecommitdiff
path: root/mesonbuild/compilers/cpp.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2019-10-30 22:25:12 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2019-10-30 22:25:12 +0200
commitaca3bff4fe4ecdf585d123f181987bc0696a7b31 (patch)
treed866e95d19da6292b5835df834808712dfc92208 /mesonbuild/compilers/cpp.py
parent025e11c9a72f313c6fa667e085b1de0e55a38781 (diff)
downloadmeson-aca3bff4fe4ecdf585d123f181987bc0696a7b31.tar.gz
Pass explicit command line argument to disable exceptions with MSVC.
Diffstat (limited to 'mesonbuild/compilers/cpp.py')
-rw-r--r--mesonbuild/compilers/cpp.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/mesonbuild/compilers/cpp.py b/mesonbuild/compilers/cpp.py
index 4e925902a..6161b7af9 100644
--- a/mesonbuild/compilers/cpp.py
+++ b/mesonbuild/compilers/cpp.py
@@ -435,7 +435,9 @@ class VisualStudioLikeCPPCompilerMixin:
eh = options['cpp_eh']
if eh.value == 'default':
args.append('/EHsc')
- elif eh.value != 'none':
+ elif eh.value == 'none':
+ args.append('/EHs-c-')
+ else:
args.append('/EH' + eh.value)
permissive, ver = self.VC_VERSION_MAP[options['cpp_std'].value]