diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2019-03-17 00:56:03 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2019-03-18 03:31:44 +0530 |
| commit | 085bfce21cc3fb4cbf6e108fb56abc5cf7ea9597 (patch) | |
| tree | d230eeeab2ebff5941f1e7ebdd9a15d82057cbdc | |
| parent | 37577dc55b065bf5c6d28165e789a178b80fe54b (diff) | |
cerbero/windwos: Fix searching of vpx dll on MSVC
vpx.lib is not an import library, but an MSVC static library. Running
dlltool against it outputs a lot of errors on stderr, and we do not
want to return that as the dllpath.
In general, we do not want errors in the output, and we also want the
command to actually fail when it errors out.
| -rw-r--r-- | cerbero/build/filesprovider.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cerbero/build/filesprovider.py b/cerbero/build/filesprovider.py index 5e64aa26..d6159b78 100644 --- a/cerbero/build/filesprovider.py +++ b/cerbero/build/filesprovider.py @@ -49,7 +49,7 @@ def get_implib_dllname(config, path): if not lib_exe: raise FatalError('lib.exe not found, check cerbero configuration') try: - ret = shell.check_call([lib_exe, '-list', path]) + ret = shell.check_output([lib_exe, '-list', path]) except FatalError: return 0 # The last line should contain the dllname @@ -58,7 +58,7 @@ def get_implib_dllname(config, path): if not dlltool: raise FatalError('dlltool not found, check cerbero configuration') try: - return shell.check_call([dlltool, '-I', path]) + return shell.check_output([dlltool, '-I', path]) except FatalError: return 0 |