buildtools: use build directory for temporary files
Use current build directory as base for temporary directories,
so that all build files are isolated there.
Fixes: e6e9730c70
("buildtools: support object file extraction for Windows")
Signed-off-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
This commit is contained in:
parent
a38eae8efa
commit
3feefc80ac
@ -7,8 +7,8 @@
|
|||||||
import sys
|
import sys
|
||||||
import tempfile
|
import tempfile
|
||||||
|
|
||||||
_, ar, archive, output, *pmdinfogen = sys.argv
|
_, tmp_root, ar, archive, output, *pmdinfogen = sys.argv
|
||||||
with tempfile.TemporaryDirectory() as temp:
|
with tempfile.TemporaryDirectory(dir=tmp_root) as temp:
|
||||||
proc = subprocess.run(
|
proc = subprocess.run(
|
||||||
# Don't use "ar p", because its output is corrupted on Windows.
|
# Don't use "ar p", because its output is corrupted on Windows.
|
||||||
[ar, "xv", os.path.abspath(archive)], stdout=subprocess.PIPE, check=True, cwd=temp
|
[ar, "xv", os.path.abspath(archive)], stdout=subprocess.PIPE, check=True, cwd=temp
|
||||||
|
@ -18,7 +18,7 @@ map_to_win_cmd = py3 + files('map_to_win.py')
|
|||||||
sphinx_wrapper = py3 + files('call-sphinx-build.py')
|
sphinx_wrapper = py3 + files('call-sphinx-build.py')
|
||||||
|
|
||||||
# select library and object file format
|
# select library and object file format
|
||||||
pmdinfo = py3 + files('gen-pmdinfo-cfile.py')
|
pmdinfo = py3 + files('gen-pmdinfo-cfile.py') + [meson.current_build_dir()]
|
||||||
pmdinfogen = py3 + files('pmdinfogen.py')
|
pmdinfogen = py3 + files('pmdinfogen.py')
|
||||||
if host_machine.system() == 'windows'
|
if host_machine.system() == 'windows'
|
||||||
if cc.get_id() == 'gcc'
|
if cc.get_id() == 'gcc'
|
||||||
|
Loading…
Reference in New Issue
Block a user