From: Jose Fonseca <jfonseca@vmware.com>
Date: Fri, 20 Mar 2015 06:27:59 +0000 (+0000)
Subject: scons: Tell MSVC STL library to not use exceptions.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=357d1fc81aceec6dda866ea74962ee2ddf3aa350;p=mesa.git

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>
---

diff --git a/scons/gallium.py b/scons/gallium.py
index b4018e76049..2b115267a8e 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']