diff options
author | Christoph Reiter <reiter.christoph@gmail.com> | 2019-08-08 21:12:03 +0200 |
---|---|---|
committer | Christoph Reiter <reiter.christoph@gmail.com> | 2019-08-08 21:12:03 +0200 |
commit | c1f4af2830ff636fa32c36964f7ee7f78d94824b (patch) | |
tree | bc79a0f7209340a8519be6d2f3bd30c18155da93 /giscanner | |
parent | 399afe04f7e59371e48544a0efb290e028c72756 (diff) | |
download | gobject-introspection-c1f4af2830ff636fa32c36964f7ee7f78d94824b.tar.gz |
ccompiler: use the distutils linker in the dumper
No need to hardcode things since distutils looks it up.
Similar to !170 but for Windows.
Diffstat (limited to 'giscanner')
-rw-r--r-- | giscanner/ccompiler.py | 9 | ||||
-rw-r--r-- | giscanner/dumper.py | 6 |
2 files changed, 10 insertions, 5 deletions
diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py index 32c92966..35549da2 100644 --- a/giscanner/ccompiler.py +++ b/giscanner/ccompiler.py @@ -413,6 +413,15 @@ class CCompiler(object): ", ".join(not_resolved)) return shlibs + @property + def linker_cmd(self): + if self.check_is_msvc(): + if not self.compiler.initialized: + self.compiler.initialize() + return [self.compiler.linker] + else: + return self.compiler.linker_exe + def check_is_msvc(self): return isinstance(self.compiler, MSVCCompiler) diff --git a/giscanner/dumper.py b/giscanner/dumper.py index abf2150e..efa18782 100644 --- a/giscanner/dumper.py +++ b/giscanner/dumper.py @@ -91,10 +91,6 @@ class DumpCompiler(object): self._uninst_srcdir = os.environ.get('UNINSTALLED_INTROSPECTION_SRCDIR') self._packages = ['gio-2.0', 'gmodule-2.0'] self._packages.extend(options.packages) - if self._compiler.check_is_msvc(): - self._linker_cmd = ['link.exe'] - else: - self._linker_cmd = self._compiler.compiler.linker_exe # Public API @@ -202,7 +198,7 @@ class DumpCompiler(object): if self._options.quiet: args.append('--silent') - args.extend(self._linker_cmd) + args.extend(self._compiler.linker_cmd) # We can use -o for the Microsoft compiler/linker, # but it is considered deprecated usage |