From 6c3b69be9bdfc29ad0c0fa2c028fad0be193e042 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 25 Mar 2010 14:20:45 +1100
Subject: build: honor existing LD_LIBRARY_PATH settings when adding shared lib
 paths

---
 source4/selftest/wscript | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/selftest')

diff --git a/source4/selftest/wscript b/source4/selftest/wscript
index 31a64cfe11..6c48b8f65b 100644
--- a/source4/selftest/wscript
+++ b/source4/selftest/wscript
@@ -1,7 +1,7 @@
 # selftest main code.
 
 import Scripting, os, Options, Utils, Environment, optparse, sys
-from samba_utils import RUN_COMMAND
+from samba_utils import RUN_COMMAND, ADD_LD_LIBRARY_PATH
 
 def set_options(opt):
     opt.ADD_COMMAND('test', cmd_test)
@@ -73,7 +73,7 @@ def cmd_testonly(opt):
     env.SELFTEST_PREFIX = Options.options.SELFTEST_PREFIX
 
     # this is needed for systems without rpath, or with rpath disabled
-    os.environ['LD_LIBRARY_PATH'] = 'bin/shared'
+    ADD_LD_LIBRARY_PATH('bin/shared')
 
     st_done = os.path.join(env.SELFTEST_PREFIX, 'st_done')
     if os.path.exists(st_done):
-- 
cgit