aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/markdown/Reference-manual.md4
-rw-r--r--mesonbuild/compilers/c.py3
-rw-r--r--mesonbuild/environment.py4
-rw-r--r--mesonbuild/interpreter.py2
4 files changed, 9 insertions, 4 deletions
diff --git a/docs/markdown/Reference-manual.md b/docs/markdown/Reference-manual.md
index 1e0a11c..3d4379a 100644
--- a/docs/markdown/Reference-manual.md
+++ b/docs/markdown/Reference-manual.md
@@ -1109,8 +1109,8 @@ This function prints its argument to stdout prefixed with WARNING:.
The first argument to this function must be a string defining the name
of this project. It is followed by programming languages that the
project uses. Supported values for languages are `c`, `cpp` (for
-`C++`), `d`, `objc`, `objcpp`, `fortran`, `java`, `cs` (for `C#`) and
-`vala`. In versions before `0.40.0` you must have at least one
+`C++`), `d`, `objc`, `objcpp`, `fortran`, `java`, `cs` (for `C#`),
+`vala` and `rust`. In versions before `0.40.0` you must have at least one
language listed.
The project name can be any string you want, it's not used for
diff --git a/mesonbuild/compilers/c.py b/mesonbuild/compilers/c.py
index 6350eee..f7864c0 100644
--- a/mesonbuild/compilers/c.py
+++ b/mesonbuild/compilers/c.py
@@ -1659,6 +1659,9 @@ class CcrxCCompiler(CcrxCompiler, CCompiler):
def get_linker_output_args(self, outputname):
return ['-output=%s' % outputname]
+ def get_werror_args(self):
+ return ['-change_message=error']
+
def get_include_args(self, path, is_system):
if path == '':
path = '.'
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
index e99174c..f287cb0 100644
--- a/mesonbuild/environment.py
+++ b/mesonbuild/environment.py
@@ -246,6 +246,10 @@ def detect_cpu_family(compilers):
trial = 'arm'
# Add more quirks here as bugs are reported. Keep in sync with detect_cpu()
# below.
+ elif trial == 'parisc64':
+ # ATM there is no 64 bit userland for PA-RISC. Thus always
+ # report it as 32 bit for simplicity.
+ trial = 'parisc'
if trial not in known_cpu_families:
mlog.warning('Unknown CPU family {!r}, please report this at '
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py
index 9ebce70..83ca336 100644
--- a/mesonbuild/interpreter.py
+++ b/mesonbuild/interpreter.py
@@ -2713,8 +2713,6 @@ external dependencies (including libraries) must go to "dependencies".''')
mlog.log('Cross', cross_comp.get_display_language(), 'compiler:',
mlog.bold(' '.join(cross_comp.get_exelist())), version_string)
self.build.add_cross_compiler(cross_comp)
- if self.environment.is_cross_build() and not need_cross_compiler:
- self.build.add_cross_compiler(comp)
self.add_base_options(comp)
return success