From bacb23155a5fb370493d0ce2fc438ea6c2982a45 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 20 Aug 2009 18:21:41 -0400 Subject: LD_LIBRARY_PATH exorcism Thanks to commit 6d510b8db, we now no longer need LD_LIBRARY_PATH to be set for invoking the compiler. Next, before we were taking the LD_LIBRARY_PATH variable and turning it into a compile path, presumably to attempt to handle the cases where we weren't getting the right -L flags. Also interacting with this was a while ago we weren't really doing uninstalled libtool libraries correctly, which is probably how hacks involving LD_LIBRARY_PATH crept into the scanner. Just require that we're passed the right -L flags, and we should be doing libtool libraries better now. --- giscanner/scannermain.py | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'giscanner') diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py index 4b742538..d70eed4a 100644 --- a/giscanner/scannermain.py +++ b/giscanner/scannermain.py @@ -247,20 +247,6 @@ def scanner_main(args): _error("Must specify --program or --library") libraries = options.libraries - # FIXME: using LPATH is definitely not portable enough. Using Python's - # find_library for finding our shared libraries is not a portable enough - # 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: - os.environ['LPATH'] = library_path filenames = [] for arg in args: if (arg.endswith('.c') or -- cgit v1.2.1