Skip to content

Commit 9e7b214

Browse files
eli-schwartznirbheek
authored andcommitted
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.
1 parent 62a95ef commit 9e7b214

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

mesonbuild/mesonlib/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616

17+
1718
"""Helper functions and classes."""
1819

1920
import os

test cases/unit/2 testsetups/meson.build

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@ project('testsetups', 'c')
22

33
vg = find_program('valgrind')
44

5+
cc = meson.get_compiler('c')
6+
# clang 14 uses dwarf 5, and valgrind 3.19 GIT does not support this
7+
if cc.get_id() == 'clang' and cc.version().version_compare('>=14') and \
8+
vg.version().version_compare('<3.20')
9+
add_project_arguments('-gdwarf-4', language: 'c')
10+
endif
11+
512
# This is only set when running under Valgrind test setup.
613
env = environment()
714
env.set('TEST_ENV', '1')

0 commit comments

Comments
 (0)