diff options
| -rw-r--r-- | mesonbuild/build.py | 3 | ||||
| -rwxr-xr-x | test cases/common/216 link custom/custom_stlib.py | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/mesonbuild/build.py b/mesonbuild/build.py index eb8e60c..4052beb 100644 --- a/mesonbuild/build.py +++ b/mesonbuild/build.py @@ -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() diff --git a/test cases/common/216 link custom/custom_stlib.py b/test cases/common/216 link custom/custom_stlib.py index 925d997..37cf298 100755 --- a/test cases/common/216 link custom/custom_stlib.py +++ b/test cases/common/216 link custom/custom_stlib.py @@ -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 |