diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-07-15 05:33:03 -0400 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-07-21 19:40:54 +0300 |
| commit | 2269b7f60b2443aa697a5616fcc3692fa3496046 (patch) | |
| tree | 085e2a1b2dd75a46f0d5d837d8d039f93656ed83 /mesonbuild/compilers/c.py | |
| parent | 381e8313ed191ae8e440a9ba3805d5322c769ea7 (diff) | |
| download | meson-2269b7f60b2443aa697a5616fcc3692fa3496046.zip meson-2269b7f60b2443aa697a5616fcc3692fa3496046.tar.gz meson-2269b7f60b2443aa697a5616fcc3692fa3496046.tar.bz2 | |
Add build_rpath as new property allowing people to specify rpath entries that are used in the build tree but will be removed on install.
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. |