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/c.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/c.py')
| -rw-r--r-- | mesonbuild/compilers/c.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/compilers/c.py b/mesonbuild/compilers/c.py index 593366a..d93c7cc 100644 --- a/mesonbuild/compilers/c.py +++ b/mesonbuild/compilers/c.py @@ -87,8 +87,8 @@ class CCompiler(Compiler): return None, fname # The default behavior is this, override in MSVC - 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_dependency_gen_args(self, outtarget, outfile): return ['-MMD', '-MQ', outtarget, '-MF', outfile] @@ -909,7 +909,7 @@ class VisualStudioCCompiler(CCompiler): "The name of the outputted import library" return ['/IMPLIB:' + implibname] - 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 [] # FIXME, no idea what these should be. |