diff options
| author | Carlos Garcia Campos <cgarcia@igalia.com> | 2013-11-13 12:31:19 +0100 |
|---|---|---|
| committer | Carlos Garcia Campos <carlosgc@gnome.org> | 2013-11-15 17:36:37 +0100 |
| commit | 95cbe0c58f729fbcd27e68a693a8bbcaaf117858 (patch) | |
| tree | e413da849fb17e8ce45b0cb9b570603466923461 /giscanner/sourcescanner.py | |
| parent | 562258d22f983b135cfc5031cb023d6b07473150 (diff) | |
| download | gobject-introspection-95cbe0c58f729fbcd27e68a693a8bbcaaf117858.tar.gz | |
giscanner: Make sure we use real paths in more places
Ensure we are using the real path also for cflags comming from
pkg_config files and command line options. This fixes the generation of
the gir files when include paths contain symlinks.
https://bugzilla.gnome.org/show_bug.cgi?id=712211
Diffstat (limited to 'giscanner/sourcescanner.py')
| -rw-r--r-- | giscanner/sourcescanner.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/giscanner/sourcescanner.py b/giscanner/sourcescanner.py index 3444445e..42af96ff 100644 --- a/giscanner/sourcescanner.py +++ b/giscanner/sourcescanner.py @@ -227,7 +227,7 @@ class SourceScanner(object): def set_cpp_options(self, includes, defines, undefines, cflags=[]): self._cpp_options.extend(cflags) - for prefix, args in [('-I', includes), + for prefix, args in [('-I', [os.path.realpath(f) for f in includes]), ('-D', defines), ('-U', undefines)]: for arg in (args or []): @@ -243,7 +243,7 @@ class SourceScanner(object): self._filenames.append(filename) headers = [] - for filename in filenames: + for filename in self._filenames: if os.path.splitext(filename)[1] in SOURCE_EXTS: self._scanner.lex_filename(filename) else: |