aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/compilers
diff options
context:
space:
mode:
authoralanNz <alangrimmer@gmail.com>2020-01-30 10:34:19 +1300
committerJussi Pakkanen <jpakkane@gmail.com>2020-01-30 22:11:26 +0200
commit1682058decb5f16ce1b78121ee587c024e9cfa17 (patch)
treebc4039a5aba5c0ee19ae85805f0dfe8eeedf85bb /mesonbuild/compilers
parent7a51f8bd11de8f3a54e32be475fb44136d25ecdb (diff)
downloadmeson-1682058decb5f16ce1b78121ee587c024e9cfa17.zip
meson-1682058decb5f16ce1b78121ee587c024e9cfa17.tar.gz
meson-1682058decb5f16ce1b78121ee587c024e9cfa17.tar.bz2
-Fixed Renesas RX Family compiler to work with latest meson, updated cross-file, fixed assembly file use
Diffstat (limited to 'mesonbuild/compilers')
-rw-r--r--mesonbuild/compilers/c.py3
-rw-r--r--mesonbuild/compilers/mixins/arm.py2
-rw-r--r--mesonbuild/compilers/mixins/ccrx.py8
3 files changed, 11 insertions, 2 deletions
diff --git a/mesonbuild/compilers/c.py b/mesonbuild/compilers/c.py
index a01b1f9..87f48e6 100644
--- a/mesonbuild/compilers/c.py
+++ b/mesonbuild/compilers/c.py
@@ -390,6 +390,9 @@ class CcrxCCompiler(CcrxCompiler, CCompiler):
'none')})
return opts
+ def get_no_stdinc_args(self):
+ return []
+
def get_option_compile_args(self, options):
args = []
std = options['c_std']
diff --git a/mesonbuild/compilers/mixins/arm.py b/mesonbuild/compilers/mixins/arm.py
index d15faec..42b2142 100644
--- a/mesonbuild/compilers/mixins/arm.py
+++ b/mesonbuild/compilers/mixins/arm.py
@@ -157,7 +157,7 @@ class ArmclangCompiler:
self.base_options = ['b_pch', 'b_lto', 'b_pgo', 'b_sanitize', 'b_coverage',
'b_ndebug', 'b_staticpic', 'b_colorout']
# Assembly
- self.can_compile_suffixes.update('s')
+ self.can_compile_suffixes.add('s')
def get_pic_args(self) -> T.List[str]:
# PIC support is not enabled by default for ARM,
diff --git a/mesonbuild/compilers/mixins/ccrx.py b/mesonbuild/compilers/mixins/ccrx.py
index 5e61805..b859215 100644
--- a/mesonbuild/compilers/mixins/ccrx.py
+++ b/mesonbuild/compilers/mixins/ccrx.py
@@ -52,7 +52,7 @@ class CcrxCompiler:
raise EnvironmentException('ccrx supports only cross-compilation.')
self.id = 'ccrx'
# Assembly
- self.can_compile_suffixes.update('s')
+ self.can_compile_suffixes.add('src')
default_warn_args = [] # type: T.List[str]
self.warn_args = {'0': [],
'1': default_warn_args,
@@ -83,6 +83,12 @@ class CcrxCompiler:
def get_coverage_args(self) -> T.List[str]:
return []
+ def get_no_stdinc_args(self) -> T.List[str]:
+ return []
+
+ def get_no_stdlib_link_args(self) -> T.List[str]:
+ return []
+
def get_optimization_args(self, optimization_level: str) -> T.List[str]:
return ccrx_optimization_args[optimization_level]