diff options
| -rw-r--r-- | Makefile.introspection | 2 | ||||
| -rw-r--r-- | giscanner/ccompiler.py | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/Makefile.introspection b/Makefile.introspection index 1812df9d..57bec209 100644 --- a/Makefile.introspection +++ b/Makefile.introspection @@ -84,7 +84,7 @@ _gir_silent_compiler = $(_gir_silent_compiler_$(V)) _gir_silent_compiler_ = $(_gir_silent_compiler_$(_gir_verbosity)) _gir_silent_compiler_0 = @echo " GICOMP $(1)"; -_gir_default_scanner_env = CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)" PKG_CONFIG="$(PKG_CONFIG)" +_gir_default_scanner_env = CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)" PKG_CONFIG="$(PKG_CONFIG)" DLLTOOL="$(DLLTOOL)" # # Creates a GIR by scanning C headers/sources diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py index 021345ee..6ddbdfe4 100644 --- a/giscanner/ccompiler.py +++ b/giscanner/ccompiler.py @@ -281,8 +281,7 @@ class CCompiler(object): args.append(utils.which(os.environ.get('SHELL', 'sh.exe'))) args.extend(libtool) args.append('--mode=execute') - # FIXME: it could have prefix (i686-w64-mingw32-dlltool.exe) - args.extend(['dlltool.exe', '--identify']) + args.extend([os.environ.get('DLLTOOL', 'dlltool.exe'), '--identify']) proc = subprocess.Popen([self.compiler_cmd, '-print-search-dirs'], stdout=subprocess.PIPE) o, e = proc.communicate() |