Merge pull request #1922 from acfoltzer/rust-improvements

Enhance Rust support

1 files changed, 10 insertions, 2 deletions

diff --git a/mesonbuild/compilers.py b/mesonbuild/compilers.py
index 3b9972f..979a5ac 100644
--- a/mesonbuild/compilers.py
+++ b/mesonbuild/compilers.py
@@ -1570,7 +1570,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):
@@ -1651,7 +1651,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):
@@ -1833,6 +1833,14 @@ class RustCompiler(Compiler):
     def get_buildtype_args(self, buildtype):
         return rust_buildtype_args[buildtype]
 
+    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']
+        p, stdo, stde = Popen_safe(cmd)
+        return stdo.split('\n')[0]
+
 class SwiftCompiler(Compiler):
     def __init__(self, exelist, version):
         self.language = 'swift'