diff options
author | Jose Fonseca <jfonseca@vmware.com> | 2015-03-20 06:27:59 +0000 |
---|---|---|
committer | Jose Fonseca <jfonseca@vmware.com> | 2015-03-22 08:23:24 +0000 |
commit | 357d1fc81aceec6dda866ea74962ee2ddf3aa350 (patch) | |
tree | a4e48265439d812fc598a2657089ef5ddcfa73f3 | |
parent | e6330f9f56d6df2c59191513630d837ef3a7b1a9 (diff) | |
download | external_mesa3d-357d1fc81aceec6dda866ea74962ee2ddf3aa350.zip external_mesa3d-357d1fc81aceec6dda866ea74962ee2ddf3aa350.tar.gz external_mesa3d-357d1fc81aceec6dda866ea74962ee2ddf3aa350.tar.bz2 |
scons: Tell MSVC STL library to not use exceptions.
MSVC defaults to no exceptions unless /EH option is passed (which we don't), while
MSVC's STL defaults to use exceptions unless _HAS_EXCEPTIONS=0 is defined,
which we didn't.
This fixes
warning C4530: C++ exception handler used, but unwind semantics are not enabled. Specify /EHsc
Reviewed-by: Brian Paul <brianp@vmware.com>
-rwxr-xr-x | scons/gallium.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scons/gallium.py b/scons/gallium.py index b4018e7..2b11526 100755 --- a/scons/gallium.py +++ b/scons/gallium.py @@ -351,6 +351,7 @@ def generate(env): '_SCL_SECURE_NO_WARNINGS', '_SCL_SECURE_NO_DEPRECATE', '_ALLOW_KEYWORD_MACROS', + '_HAS_EXCEPTIONS=0', # Tell C++ STL to not use exceptions ] if env['build'] in ('debug', 'checked'): cppdefines += ['_DEBUG'] |