gobject-introspection r822 - in trunk: . tools

[jobi svn gnome org]

Author: jobi
Date: Tue Oct 28 19:17:44 2008
New Revision: 822
URL: http://svn.gnome.org/viewvc/gobject-introspection?rev=822&view=rev

Log:

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

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



Modified:
   trunk/ChangeLog
   trunk/tools/g-ir-scanner

Modified: trunk/tools/g-ir-scanner
==============================================================================
--- trunk/tools/g-ir-scanner	(original)
+++ trunk/tools/g-ir-scanner	Tue Oct 28 19:17:44 2008
@@ -228,6 +228,11 @@
     # 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: