build: support systems without rpath

[ira/wip.git] / buildtools / wafsamba / samba_utils.py

diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py
index 9893a86c300b6655f25262f9e6fef9de7dac2945..564b5b82e319d9620d9e6afdd20a859d002582f1 100644 (file)
--- a/buildtools/wafsamba/samba_utils.py
+++ b/buildtools/wafsamba/samba_utils.py
@@ -62,13 +62,16 @@ def runonce(function):
 
 def set_rpath(bld):
     '''setup the default rpath'''
-    rpath = os.path.normpath('%s/%s' % (bld.env['BUILD_DIRECTORY'], LIB_PATH))
-    bld.env.append_value('RPATH', '-Wl,-rpath=%s' % rpath)
+    if bld.env.RPATH_ON_BUILD:
+        rpath = os.path.normpath('%s/%s' % (bld.env['BUILD_DIRECTORY'], LIB_PATH))
+        bld.env.append_value('RPATH', '-Wl,-rpath=%s' % rpath)
+    else:
+        os.environ['LD_LIBRARY_PATH'] = os.path.normpath('%s/../shared' % bld.srcnode.abspath(bld.env))
 Build.BuildContext.set_rpath = set_rpath
 
 def install_rpath(bld):
     '''the rpath value for installation'''
-    if bld.env['RPATH_ON_INSTALL']:
+    if bld.env.RPATH_ON_INSTALL:
         return ['-Wl,-rpath=%s/lib' % bld.env.PREFIX]
     return []