diff options
| author | Colin Walters <walters@verbum.org> | 2009-08-05 13:24:23 -0400 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2009-08-05 13:24:23 -0400 |
| commit | 81956adedbc8f3134930b682471faaa1b5e4c9f7 (patch) | |
| tree | 3200dc05dcd1ac17eb4e95e0992b9cb3cd544147 | |
| parent | 3571efc047eed05c816d898e732ac92e8bf76673 (diff) | |
| download | gobject-introspection-81956adedbc8f3134930b682471faaa1b5e4c9f7.tar.gz | |
Use all libraries specified on the command line
Earlier we were only using the first library specified when
compiling an introspection binary. This breaks builds on Solaris
which doesn't have implicit linking and we need to be able
to specify multiple libraries.
The tension here is primarily related to OS X' distinction between
modules and shared libraries; if we build the custom libraries
in gir-repository as shared libraries, then we can't dlopen them.
If we build them as modules, then the introspection binary compiler
can't link to them.
If we want to fix the OS X build, probably the way to go would be
a special --use-first-library-only option that gets conditionalized
on OS X + gir-repository.
But even better is to finish killing gir-repository entirely.
| -rw-r--r-- | giscanner/dumper.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/giscanner/dumper.py b/giscanner/dumper.py index e6a81488..0353a2f1 100644 --- a/giscanner/dumper.py +++ b/giscanner/dumper.py @@ -207,12 +207,11 @@ class DumpCompiler(object): # hack for building GIRepository.gir, skip -lgirepository-1.0 since # libgirepository-1.0.la is not in current directory and we refer to it # explicitly below anyway - if (not uninst_builddir or - self._options.libraries[0] != 'girepository-1.0'): - # 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]) + for library in self._options.libraries: + if (uninst_builddir and + self._options.libraries[0] == 'girepository-1.0'): + continue + args.append('-l' + library) # hack for building gobject-introspection itself if uninst_builddir: |