From f9060a70bb9333fb6e4b892563e7245afbcd0074 Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Thu, 3 Sep 2015 00:01:39 +0300 Subject: Converted a bunch of locations to support different target output path. --- backends.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'backends.py') diff --git a/backends.py b/backends.py index a6f230f..11b0e1d 100644 --- a/backends.py +++ b/backends.py @@ -69,7 +69,8 @@ class Backend(): return filename def get_target_dir(self, target): - dirname = target.get_subdir() +# dirname = target.get_subdir() + dirname = 'meson-out' os.makedirs(os.path.join(self.environment.get_build_dir(), dirname), exist_ok=True) return dirname @@ -257,8 +258,15 @@ class Backend(): if not isinstance(target, build.Executable): print(target) return [] - prospectives = target.get_transitive_rpaths() - return [os.path.join(self.environment.get_build_dir(), i) for i in prospectives if len(i) > 0] + prospectives = target.get_transitive_link_deps() + result = [] + for ld in prospectives: + if ld == '' or ld == '.': + continue + dirseg = os.path.join(self.environment.get_build_dir(), self.get_target_dir()) + if dirseg not in result: + result.append(dirseg) + return result def write_test_file(self, datafile): arr = [] -- cgit v1.1