diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2022-08-11 07:13:33 -0400 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2022-08-13 01:53:03 +0530 |
| commit | 9e7b21498072afff4f201ce482e2a676d711491c (patch) | |
| tree | 60b9429adabfb39130048adc15eb3aa16d086448 | |
| parent | 62a95eff3e75a80ecddc12a15cf2be60627d52c2 (diff) | |
| download | meson-9e7b21498072afff4f201ce482e2a676d711491c.zip meson-9e7b21498072afff4f201ce482e2a676d711491c.tar.gz meson-9e7b21498072afff4f201ce482e2a676d711491c.tar.bz2 | |
CI: fix error when mixing clang 14 with released valgrind versions
Because clang now defaults to a dwarf version that valgrind does not yet
support. There's support in valgrind git master, though.
| -rw-r--r-- | mesonbuild/mesonlib/__init__.py | 1 | ||||
| -rw-r--r-- | test cases/unit/2 testsetups/meson.build | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/mesonbuild/mesonlib/__init__.py b/mesonbuild/mesonlib/__init__.py index 5b2e82d..9d673fd 100644 --- a/mesonbuild/mesonlib/__init__.py +++ b/mesonbuild/mesonlib/__init__.py @@ -14,6 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. + """Helper functions and classes.""" import os diff --git a/test cases/unit/2 testsetups/meson.build b/test cases/unit/2 testsetups/meson.build index 1e8f018..91a5fbe 100644 --- a/test cases/unit/2 testsetups/meson.build +++ b/test cases/unit/2 testsetups/meson.build @@ -2,6 +2,13 @@ project('testsetups', 'c') vg = find_program('valgrind') +cc = meson.get_compiler('c') +# clang 14 uses dwarf 5, and valgrind 3.19 GIT does not support this +if cc.get_id() == 'clang' and cc.version().version_compare('>=14') and \ + vg.version().version_compare('<3.20') + add_project_arguments('-gdwarf-4', language: 'c') +endif + # This is only set when running under Valgrind test setup. env = environment() env.set('TEST_ENV', '1') |