pull/1126/head
Jussi Pakkanen 8 years ago
parent 04a2e6ded3
commit 023dc6953c
  1. 12
      mesonbuild/compilers.py

@ -532,7 +532,7 @@ class CCompiler(Compiler):
# Almost every compiler uses this for disabling warnings # Almost every compiler uses this for disabling warnings
return ['-w'] return ['-w']
def get_soname_args(self, prefix, shlib_name, suffix, path, soversion): def get_soname_args(self, prefix, shlib_name, suffix, path, soversion, is_shared_module):
return [] return []
def split_shlib_to_parts(self, fname): def split_shlib_to_parts(self, fname):
@ -1148,7 +1148,7 @@ class MonoCompiler(Compiler):
def get_link_args(self, fname): def get_link_args(self, fname):
return ['-r:' + fname] return ['-r:' + fname]
def get_soname_args(self, prefix, shlib_name, suffix, path, soversion): def get_soname_args(self, prefix, shlib_name, suffix, path, soversion, is_shared_module):
return [] return []
def get_werror_args(self): def get_werror_args(self):
@ -1229,7 +1229,7 @@ class JavaCompiler(Compiler):
self.id = 'unknown' self.id = 'unknown'
self.javarunner = 'java' self.javarunner = 'java'
def get_soname_args(self, prefix, shlib_name, suffix, path, soversion): def get_soname_args(self, prefix, shlib_name, suffix, path, soversion, is_shared_module):
return [] return []
def get_werror_args(self): def get_werror_args(self):
@ -1528,7 +1528,7 @@ class DCompiler(Compiler):
def get_std_shared_lib_link_args(self): def get_std_shared_lib_link_args(self):
return ['-shared'] return ['-shared']
def get_soname_args(self, prefix, shlib_name, suffix, path, soversion): def get_soname_args(self, prefix, shlib_name, suffix, path, soversion, is_shared_module):
return [] return []
def get_unittest_args(self): def get_unittest_args(self):
@ -2178,7 +2178,7 @@ class ClangCompiler():
# so it might change semantics at any time. # so it might change semantics at any time.
return ['-include-pch', os.path.join (pch_dir, self.get_pch_name (header))] return ['-include-pch', os.path.join (pch_dir, self.get_pch_name (header))]
def get_soname_args(self, prefix, shlib_name, suffix, path, soversion): def get_soname_args(self, prefix, shlib_name, suffix, path, soversion, is_shared_module):
if self.clang_type == CLANG_STANDARD: if self.clang_type == CLANG_STANDARD:
gcc_type = GCC_STANDARD gcc_type = GCC_STANDARD
elif self.clang_type == CLANG_OSX: elif self.clang_type == CLANG_OSX:
@ -2187,7 +2187,7 @@ class ClangCompiler():
gcc_type = GCC_MINGW gcc_type = GCC_MINGW
else: else:
raise MesonException('Unreachable code when converting clang type to gcc type.') raise MesonException('Unreachable code when converting clang type to gcc type.')
return get_gcc_soname_args(gcc_type, prefix, shlib_name, suffix, path, soversion) return get_gcc_soname_args(gcc_type, prefix, shlib_name, suffix, path, soversion, is_shared_module)
def has_argument(self, arg, env): def has_argument(self, arg, env):
return super().has_argument(['-Werror=unknown-warning-option', arg], env) return super().has_argument(['-Werror=unknown-warning-option', arg], env)

Loading…
Cancel
Save