From: Johan Bilien <jobi@via.ecp.fr>
Date: Tue, 28 Oct 2008 19:17:44 +0000 (+0000)
Subject: add LD_LIBRARY_PATH to LPATH before calling ld.
X-Git-Tag: GOBJECT_INTROSPECTION_0_6_0~31
X-Git-Url: http://git.roojs.org/?a=commitdiff_plain;h=eea9270e454efe26376bf4ad3336cc1fd696c35f;p=gnome.gobject-introspection

add LD_LIBRARY_PATH to LPATH before calling ld.


2008-10-28  Johan Bilien  <jobi@via.ecp.fr>

	* tools/g-ir-scanner: add LD_LIBRARY_PATH to LPATH before calling ld.


svn path=/trunk/; revision=822
---

diff --git a/ChangeLog b/ChangeLog
index 3e10ff9..8d6edea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-10-28  Johan Bilien  <jobi@via.ecp.fr>
+
+	* tools/g-ir-scanner: add LD_LIBRARY_PATH to LPATH before calling ld.
+
 2008-10-27  Johan Bilien  <jobi@via.ecp.fr>
 
 	* gio/gio-2.0.c: add allow-none annotations, based on the pygobject
diff --git a/tools/g-ir-scanner b/tools/g-ir-scanner
index f1ad7eb..e4c1862 100755
--- a/tools/g-ir-scanner
+++ b/tools/g-ir-scanner
@@ -228,6 +228,11 @@ def main(args):
     # anyway as it behaves differently depending on the OS
     lpath = os.environ.get('LPATH')
     library_path = ':'.join(options.library_paths)
+
+    ld_library_path = os.environ.get('LD_LIBRARY_PATH')
+    if ld_library_path:
+        library_path = ':'.join([ld_library_path, library_path])
+
     if lpath:
         os.environ['LPATH'] = ':'.join([lpath, library_path])
     else: