diff options
| author | Alexander Bokovoy <ab@samba.org> | 2018-01-31 11:48:43 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2018-09-05 06:37:22 +0200 |
| commit | 4e65b33c1d40bb2c243f775f388056aed31d8671 (patch) | |
| tree | 5a41b6ddef7ce1c0b6a93bcc16ef89da10f080e8 /third_party/waf/waflib/Tools/suncc.py | |
| parent | faef27506977db01cc4619140a71652463914378 (diff) | |
| download | samba-4e65b33c1d40bb2c243f775f388056aed31d8671.tar.gz | |
third_party:waf: update to upstream 2.0.4 release
Update third_party/waf/ to 2.0.4 to bring us closer to Python 3
This change requires a number of changes in buildtools/ too.
Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'third_party/waf/waflib/Tools/suncc.py')
| -rw-r--r-- | third_party/waf/waflib/Tools/suncc.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/third_party/waf/waflib/Tools/suncc.py b/third_party/waf/waflib/Tools/suncc.py index cc59e54c2bd..5a3318368aa 100644 --- 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() + |