third_party:waf: update to upstream 2.0.4 release

[sfrench/samba-autobuild/.git] / third_party / waf / waflib / Tools / suncc.py

diff --git a/third_party/waf/waflib/Tools/suncc.py b/third_party/waf/waflib/Tools/suncc.py
index cc59e54c2bd6cdbb1d4be33946a410dd2d219e5f..5a3318368aa4b9c0423d2bd5ea138ae6106b5423 100644 (file)
--- a/third_party/waf/waflib/Tools/suncc.py
+++ b/third_party/waf/waflib/Tools/suncc.py
@@ -4,9 +4,10 @@
 
 #!/usr/bin/env python
 # encoding: utf-8
-# Thomas Nagy, 2006-2016 (ita)
+# Thomas Nagy, 2006-2018 (ita)
 # Ralf Habacker, 2006 (rh)
 
+from waflib import Errors
 from waflib.Tools import ccroot, ar
 from waflib.Configure import conf
 
@@ -19,7 +20,7 @@ def find_scc(conf):
        cc = conf.find_program('cc', var='CC')
        try:
                conf.cmd_and_log(cc + ['-flags'])
-       except Exception:
+       except Errors.WafError:
                conf.fatal('%r is not a Sun compiler' % cc)
        v.CC_NAME = 'sun'
        conf.get_suncc_version(cc)
@@ -67,3 +68,4 @@ def configure(conf):
        conf.cc_load_tools()
        conf.cc_add_flags()
        conf.link_add_flags()
+