git.samba.org
/
samba.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
third_party:waf: update to upstream 2.0.4 release
[samba.git]
/
third_party
/
waf
/
waflib
/
Tools
/
irixcc.py
diff --git
a/third_party/waf/waflib/Tools/irixcc.py
b/third_party/waf/waflib/Tools/irixcc.py
index 413261e2a145f14ea7c6b04bece33c2f7de37225..ed5c49ff6e0791788b56756423f2d1122260cf35 100644
(file)
--- a/
third_party/waf/waflib/Tools/irixcc.py
+++ b/
third_party/waf/waflib/Tools/irixcc.py
@@
-10,6
+10,7
@@
Compiler definition for irix/MIPSpro cc compiler
"""
Compiler definition for irix/MIPSpro cc compiler
"""
+from waflib import Errors
from waflib.Tools import ccroot, ar
from waflib.Configure import conf
from waflib.Tools import ccroot, ar
from waflib.Configure import conf
@@
-28,7
+29,7
@@
def find_irixcc(conf):
try:
conf.cmd_and_log(cc + ['-version'])
try:
conf.cmd_and_log(cc + ['-version'])
- except E
xception
:
+ except E
rrors.WafError
:
conf.fatal('%r -version could not be executed' % cc)
v.CC = cc
conf.fatal('%r -version could not be executed' % cc)
v.CC = cc
@@
-66,3
+67,4
@@
def configure(conf):
conf.cc_load_tools()
conf.cc_add_flags()
conf.link_add_flags()
conf.cc_load_tools()
conf.cc_add_flags()
conf.link_add_flags()
+