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 | |
| parent | f4d13e180fad89aaae863b6ae057b8d94ec25ef7 (diff) | |
| download | meson-35fae9d019352dcef01a44944d0096c4c33bbda0.zip meson-35fae9d019352dcef01a44944d0096c4c33bbda0.tar.gz meson-35fae9d019352dcef01a44944d0096c4c33bbda0.tar.bz2 | |
fix failing Rust test cases
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 13 | ||||
| -rw-r--r-- | mesonbuild/compilers.py | 8 | ||||
| -rw-r--r-- | test cases/rust/2 sharedlib/installed_files.txt | 2 |
3 files changed, 18 insertions, 5 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 8da75c0..40f0918 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -1188,8 +1188,21 @@ int dummy; # against are dynamic, otherwise we'll end up with # multiple implementations of crates args += ['-C', 'prefer-dynamic'] + # build the usual rpath arguments as well... + + # Set runtime-paths so we can run executables without needing to set + # LD_LIBRARY_PATH, etc in the environment. Doesn't work on Windows. + if '/' in target.name or '\\' in target.name: + # Target names really should not have slashes in them, but + # unfortunately we did not check for that and some downstream projects + # now have them. Once slashes are forbidden, remove this bit. + target_slashname_workaround_dir = os.path.join(os.path.split(target.name)[0], + self.get_target_dir(target)) + else: + target_slashname_workaround_dir = self.get_target_dir(target) rpath_args = rustc.build_rpath_args(self.environment.get_build_dir(), + target_slashname_workaround_dir, self.determine_rpath_dirs(target), target.install_rpath) # ... but then add rustc's sysroot to account for rustup 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'] diff --git a/test cases/rust/2 sharedlib/installed_files.txt b/test cases/rust/2 sharedlib/installed_files.txt index 85acff2..680343d 100644 --- a/test cases/rust/2 sharedlib/installed_files.txt +++ b/test cases/rust/2 sharedlib/installed_files.txt @@ -1,2 +1,2 @@ usr/bin/prog?exe -usr/lib/libstuff.rlib +usr/lib/libstuff.so |