aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2014-09-23 00:12:29 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2014-09-23 00:12:29 +0300
commit1dc8d324fa3005628c9eff3dd105bd353f930f4a (patch)
tree61dd3df28a7d11378bd64f9d4411a19bf2d0049f
parent6f8222a46e6be9dd74f3e42f5babdb2ed292098d (diff)
downloadmeson-1dc8d324fa3005628c9eff3dd105bd353f930f4a.zip
meson-1dc8d324fa3005628c9eff3dd105bd353f930f4a.tar.gz
meson-1dc8d324fa3005628c9eff3dd105bd353f930f4a.tar.bz2
A few fixes for bug #6.
-rw-r--r--environment.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/environment.py b/environment.py
index 16369f7..251c679 100644
--- a/environment.py
+++ b/environment.py
@@ -131,7 +131,7 @@ class CCompiler():
def get_linker_always_args(self):
return []
- def get_soname_args(self, shlib_name, path):
+ def get_soname_args(self, shlib_name, path, soversion):
return []
def split_shlib_to_parts(self, fname):
@@ -504,7 +504,7 @@ class MonoCompiler():
def get_link_args(self, fname):
return ['-r:' + fname]
- def get_soname_args(self, shlib_name, path):
+ def get_soname_args(self, shlib_name, path, soversion):
return []
def get_werror_args(self):
@@ -641,7 +641,7 @@ class JavaCompiler():
def get_linker_always_args(self):
return []
- def get_soname_args(self, shlib_name, path):
+ def get_soname_args(self, shlib_name, path, soversion):
return []
def get_werror_args(self):
@@ -936,6 +936,9 @@ class VisualStudioCCompiler(CCompiler):
if pe.returncode != 0:
raise EnvironmentException('Executables created by C++ compiler %s are not runnable.' % self.name_string())
+ def build_rpath_args(self, build_dir, rpath_paths, install_rpath):
+ return []
+
class VisualStudioCPPCompiler(VisualStudioCCompiler):
def __init__(self, exelist, version, is_cross, exe_wrap):
VisualStudioCCompiler.__init__(self, exelist, version, is_cross, exe_wrap)