diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-03-26 13:20:05 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-04-06 20:27:07 +1000 |
| commit | 6d268e4a826de46d3397741cd81cb2790d378587 (patch) | |
| tree | 9b99263e2370ab44f1850206bcd4dba2e2dbdc71 /buildtools | |
| parent | eb776a80b59ca20b58b9b4c832b70914263d278c (diff) | |
| download | samba-6d268e4a826de46d3397741cd81cb2790d378587.tar.gz samba-6d268e4a826de46d3397741cd81cb2790d378587.tar.bz2 samba-6d268e4a826de46d3397741cd81cb2790d378587.zip | |
build: improved exception handling for systems without rpath
Diffstat (limited to 'buildtools')
| -rw-r--r-- | buildtools/wafsamba/samba_conftests.py | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/buildtools/wafsamba/samba_conftests.py b/buildtools/wafsamba/samba_conftests.py index af7e0c0481..742959db84 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) |