diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-07-21 22:19:07 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-07-21 22:19:07 +0300 |
| commit | bff37a90fc475c6204087dcf1ccb6734b990141e (patch) | |
| tree | d228c8107a4daf66e76f3d0fa4a03e5e689c55e9 /mesonbuild/compilers/d.py | |
| parent | 328a1f30fdfdadc6d5df4ebfc075e9cd5c0df96e (diff) | |
| parent | e82edc179fe86e68d1f74fe084fd891ef2d12316 (diff) | |
| download | meson-bff37a90fc475c6204087dcf1ccb6734b990141e.zip meson-bff37a90fc475c6204087dcf1ccb6734b990141e.tar.gz meson-bff37a90fc475c6204087dcf1ccb6734b990141e.tar.bz2 | |
Merged buildrpath branch.
Diffstat (limited to 'mesonbuild/compilers/d.py')
| -rw-r--r-- | mesonbuild/compilers/d.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mesonbuild/compilers/d.py b/mesonbuild/compilers/d.py index e1d534f..a989704 100644 --- a/mesonbuild/compilers/d.py +++ b/mesonbuild/compilers/d.py @@ -88,12 +88,14 @@ class DCompiler(Compiler): def get_std_exe_link_args(self): return [] - def build_rpath_args(self, build_dir, from_dir, rpath_paths, install_rpath): + def build_rpath_args(self, build_dir, from_dir, rpath_paths, build_rpath, install_rpath): # This method is to be used by LDC and DMD. # GDC can deal with the verbatim flags. if not rpath_paths and not install_rpath: return [] paths = ':'.join([os.path.join(build_dir, p) for p in rpath_paths]) + if build_rpath != '': + paths += ':' + build_rpath if len(paths) < len(install_rpath): padding = 'X' * (len(install_rpath) - len(paths)) if not paths: @@ -212,8 +214,8 @@ class GnuDCompiler(DCompiler): def get_buildtype_args(self, buildtype): return d_gdc_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 build_rpath_args(self, build_dir, from_dir, rpath_paths, build_rpath, install_rpath): + return self.build_unix_rpath_args(build_dir, from_dir, rpath_paths, build_rpath, install_rpath) def get_unittest_args(self): return ['-funittest'] |