diff --git a/mesonbuild/compilers/mixins/metrowerks.py b/mesonbuild/compilers/mixins/metrowerks.py index 8934e8376f42..60982212e241 100644 --- a/mesonbuild/compilers/mixins/metrowerks.py +++ b/mesonbuild/compilers/mixins/metrowerks.py @@ -179,13 +179,12 @@ def __init__(self) -> None: self.base_options = { OptionKey(o) for o in ['b_pch', 'b_ndebug']} - default_warn_args: T.List[str] = [] self.warn_args: T.Dict[str, T.List[str]] = { - '0': ['-w', 'off'], - '1': default_warn_args, - '2': default_warn_args + ['-w', 'most'], - '3': default_warn_args + ['-w', 'all'], - 'everything': default_warn_args + ['-w', 'full']} + '0': ['-warnings', 'off'], + '1': [], + '2': ['-warnings', 'on,nocmdline'], + '3': ['-warnings', 'on,all'], + 'everything': ['-warnings', 'on,full']} def depfile_for_object(self, objfile: str) -> T.Optional[str]: # Earlier versions of these compilers do not support specifying @@ -275,6 +274,6 @@ def _unix_args_to_native(cls, args: T.List[str], info: MachineInfo) -> T.List[st def compute_parameters_with_absolute_paths(self, parameter_list: T.List[str], build_dir: str) -> T.List[str]: for idx, i in enumerate(parameter_list): if i[:2] == '-I': - parameter_list[idx] = i[:9] + os.path.normpath(os.path.join(build_dir, i[9:])) + parameter_list[idx] = i[:2] + os.path.normpath(os.path.join(build_dir, i[2:])) return parameter_list diff --git a/mesonbuild/linkers/linkers.py b/mesonbuild/linkers/linkers.py index dc42b3a2032f..c4df0fa1d893 100644 --- a/mesonbuild/linkers/linkers.py +++ b/mesonbuild/linkers/linkers.py @@ -1637,9 +1637,6 @@ def get_allow_undefined_args(self) -> T.List[str]: def get_accepts_rsp(self) -> bool: return True - def get_lib_prefix(self) -> str: - return "" - def get_linker_always_args(self) -> T.List[str]: return [] @@ -1652,8 +1649,9 @@ def get_search_args(self, dirname: str) -> T.List[str]: def invoked_by_compiler(self) -> bool: return False - def rsp_file_syntax(self) -> RSPFileSyntax: - return RSPFileSyntax.GCC + def get_soname_args(self, env: 'Environment', prefix: str, shlib_name: str, + suffix: str, soversion: str, darwin_versions: T.Tuple[str, str]) -> T.List[str]: + raise MesonException(f'{self.id} does not support shared libraries.') class MetrowerksLinkerARM(MetrowerksLinker):