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/linkers.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/linkers.py')
| -rw-r--r-- | mesonbuild/linkers.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/linkers.py b/mesonbuild/linkers.py index d0d5184..e0554e0 100644 --- a/mesonbuild/linkers.py +++ b/mesonbuild/linkers.py @@ -45,7 +45,7 @@ class VisualStudioLinker(StaticLinker): def get_linker_always_args(self): return VisualStudioLinker.always_args - 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): return [] def thread_link_flags(self): @@ -76,7 +76,7 @@ class ArLinker(StaticLinker): else: self.std_args = ['csr'] - 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): return [] def get_exelist(self): |