aboutsummaryrefslogtreecommitdiff
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-11-02 19:49:14 +0200
commit760b8633bc350b15ae7f67fe1d78ed91179bbb79 (patch)
tree89c966fcb5f9730c213a550a13bceda7d915123c /mesonbuild/compilers/cpp.py
parentd218d523679d28ae62082e3d371baf799510b2ce (diff)
downloadmeson-760b8633bc350b15ae7f67fe1d78ed91179bbb79.zip
meson-760b8633bc350b15ae7f67fe1d78ed91179bbb79.tar.gz
meson-760b8633bc350b15ae7f67fe1d78ed91179bbb79.tar.bz2
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 4e92590..6161b7a 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]