summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavier Claessens <xavier.claessens@collabora.com>2023-10-12 18:02:13 -0400
committerXavier Claessens <xclaesse@gmail.com>2023-11-02 07:55:32 -0400
commitde03bf51d8fc704728d4bf0e8feb90e545f964c5 (patch)
tree95b773078674fa2ada0beb61c2f18d2c58de41a0
parent204563751ed907cd507d3a1a2f48bd8c22b5bb97 (diff)
downloadmeson-de03bf51d8fc704728d4bf0e8feb90e545f964c5.tar.gz
rust: Do not use +verbatim on MacOS
It seems broken and fails on our CI: https://github.com/rust-lang/rust/issues/116674
-rw-r--r--mesonbuild/backend/ninjabackend.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
index faf3acfc0..41bdf4cc6 100644
--- a/mesonbuild/backend/ninjabackend.py
+++ b/mesonbuild/backend/ninjabackend.py
@@ -1972,7 +1972,8 @@ class NinjaBackend(backends.Backend):
else:
whole_archive = ''
- if mesonlib.version_compare(rustc.version, '>= 1.67.0'):
+ # FIXME: Seems broken on MacOS: https://github.com/rust-lang/rust/issues/116674
+ if mesonlib.version_compare(rustc.version, '>= 1.67.0') and not mesonlib.is_osx():
verbatim = '+verbatim'
else:
verbatim = ''