From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 26 Mar 2010 02:20:05 +0000 (+1100)
Subject: build: improved exception handling for systems without rpath
X-Git-Tag: samba-3.6.0pre1~3423
X-Git-Url: http://git.samba.org/samba.git/?p=nivanova%2Fsamba-autobuild%2F.git;a=commitdiff_plain;h=6d268e4a826de46d3397741cd81cb2790d378587;hp=eb776a80b59ca20b58b9b4c832b70914263d278c

build: improved exception handling for systems without rpath
---

diff --git a/buildtools/wafsamba/samba_conftests.py b/buildtools/wafsamba/samba_conftests.py
index af7e0c04818..742959db84d 100644
--- 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)