diff options
author | Tommi Komulainen <tko@src.gnome.org> | 2008-11-25 17:02:43 +0000 |
---|---|---|
committer | Tommi Komulainen <tko@src.gnome.org> | 2008-11-25 17:02:43 +0000 |
commit | 5797804466230a27dcfef0635ee2bc3fba7b0c71 (patch) | |
tree | 1e105a8e67f7cd46cc3d0d0fb066719b41a1ce52 | |
parent | 5f9faf55884a8a32c47ff56165020b6988cc7aa0 (diff) | |
download | gobject-introspection-5797804466230a27dcfef0635ee2bc3fba7b0c71.tar.gz |
prefer uninstalled libraries to installed ones
* giscanner/dumper.py (_link): prefer uninstalled libraries to
installed ones so that we don't introspect an older, installed
version
svn path=/trunk/; revision=965
-rw-r--r-- | giscanner/dumper.py | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/giscanner/dumper.py b/giscanner/dumper.py index 727bbca1..a6945789 100644 --- a/giscanner/dumper.py +++ b/giscanner/dumper.py @@ -163,6 +163,19 @@ class DumpCompiler(object): args.extend(['libtool', '--mode=link']) args.extend([self._linker_cmd, '-o', output]) + + # Make sure to list the library to be introspected first since it's + # likely to be uninstalled yet and we want the uninstalled RPATHs have + # priority (or we might run with installed library that is older) + + # Search the current directory first + args.append('-L.') + + # We only use the first library; assume others are "custom" libraries + # like from gir-repository. Right now those don't define new GTypes, + # so we don't need to introspect them. + args.append('-l' + self._options.libraries[0]) + args.extend(self._run_pkgconfig('--libs')) for source in sources: if not os.path.exists(source): @@ -177,13 +190,6 @@ class DumpCompiler(object): 'libgirepository.la') args.append(path) - # Search the current directory first - args.append('-L.') - - # We only use the first library; assume others are "custom" libraries - # like from gir-repository. Right now those don't define new GTypes, - # so we don't need to introspect them. - args.append('-l' + self._options.libraries[0]) subprocess.check_call(args) |