git.samba.org
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
eb776a8
)
build: improved exception handling for systems without rpath
author
Andrew Tridgell
<tridge@samba.org>
Fri, 26 Mar 2010 02:20:05 +0000
(13:20 +1100)
committer
Andrew Tridgell
<tridge@samba.org>
Tue, 6 Apr 2010 10:27:07 +0000
(20:27 +1000)
buildtools/wafsamba/samba_conftests.py
patch
|
blob
|
history
diff --git
a/buildtools/wafsamba/samba_conftests.py
b/buildtools/wafsamba/samba_conftests.py
index af7e0c048186249e66d750159fde044ebcdb8fc2..742959db84dc92933b260782442b00f1d0f62253 100644
(file)
--- a/
buildtools/wafsamba/samba_conftests.py
+++ b/
buildtools/wafsamba/samba_conftests.py
@@
-140,18
+140,13
@@
def CHECK_RPATH_SUPPORT(conf):
# compile the program
try:
bld.compile()
- except Utils.WafError:
- ret = Utils.ex_stack()
- else:
- ret = 0
+ except:
+ conf.check_message('rpath support', '', False)
+ return False
# chdir before returning
os.chdir(back)
- if ret:
- conf.log.write('command returned %r' % ret)
- conf.fatal(str(ret))
-
# path for execution
lastprog = o.link_task.outputs[0].abspath(env)