diff options
| author | Adam C. Foltzer <acfoltzer@galois.com> | 2017-06-14 11:50:35 -0700 |
|---|---|---|
| committer | Adam C. Foltzer <acfoltzer@galois.com> | 2017-06-14 11:50:35 -0700 |
| commit | 35fae9d019352dcef01a44944d0096c4c33bbda0 (patch) | |
| tree | 5a5802cf9e8a580d55f3f1dc8e5d156f19d93c3f /mesonbuild/compilers.py | |
| parent | f4d13e180fad89aaae863b6ae057b8d94ec25ef7 (diff) | |
| download | meson-35fae9d019352dcef01a44944d0096c4c33bbda0.zip meson-35fae9d019352dcef01a44944d0096c4c33bbda0.tar.gz meson-35fae9d019352dcef01a44944d0096c4c33bbda0.tar.bz2 | |
fix failing Rust test cases
Diffstat (limited to 'mesonbuild/compilers.py')
| -rw-r--r-- | mesonbuild/compilers.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mesonbuild/compilers.py b/mesonbuild/compilers.py index 6e7283c..833071e 100644 --- a/mesonbuild/compilers.py +++ b/mesonbuild/compilers.py @@ -1546,7 +1546,7 @@ class MonoCompiler(Compiler): def split_shlib_to_parts(self, fname): return None, fname - def build_rpath_args(self, build_dir, rpath_paths, install_rpath): + def build_rpath_args(self, build_dir, from_dir, rpath_paths, install_rpath): return [] def get_dependency_gen_args(self, outtarget, outfile): @@ -1627,7 +1627,7 @@ class JavaCompiler(Compiler): def split_shlib_to_parts(self, fname): return None, fname - def build_rpath_args(self, build_dir, rpath_paths, install_rpath): + def build_rpath_args(self, build_dir, from_dir, rpath_paths, install_rpath): return [] def get_dependency_gen_args(self, outtarget, outfile): @@ -1809,8 +1809,8 @@ class RustCompiler(Compiler): def get_buildtype_args(self, buildtype): return rust_buildtype_args[buildtype] - def build_rpath_args(self, build_dir, rpath_paths, install_rpath): - return build_unix_rpath_args(build_dir, rpath_paths, install_rpath) + def build_rpath_args(self, build_dir, from_dir, rpath_paths, install_rpath): + return self.build_unix_rpath_args(build_dir, from_dir, rpath_paths, install_rpath) def get_sysroot(self): cmd = self.exelist + ['--print', 'sysroot'] |