Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Win fixes.

This commit is contained in:
Jussi Pakkanen 2019-03-19 00:26:43 +02:00
parent 95f5a72f62
commit 19eb0e762a
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mesonbuild/build.py
View File

@ -2101,6 +2101,9 @@ class CustomTarget(Target):
if suf == '.a' or suf == '.dll' or suf == '.lib' or suf == '.so':
return True
def get_link_deps_mapping(self, prefix, environment):
return {}
def get_link_dep_subdirs(self):
return OrderedSet()

4
test cases/common/216 link custom/custom_stlib.py
View File

@ -18,12 +18,12 @@ void flob() {
def generate_lib_gnulike(outfile, c_file, private_dir, compiler_array):
static_linker = 'ar'
o_file = c_file.with_suffix('.o')
compile_cmd = compiler_array + ['-c', '-g', '-O2', '-o', o_file, c_file]
compile_cmd = compiler_array + ['-c', '-g', '-O2', '-o', str(o_file), str(c_file)]
subprocess.check_call(compile_cmd)
out_file = pathlib.Path(outfile)
if out_file.exists():
out_file.unlink()
link_cmd = [static_linker, 'csrD', outfile, o_file]
link_cmd = [static_linker, 'csrD', outfile, str(o_file)]
subprocess.check_call(link_cmd)
return 0