shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-22 17:35:35 +03:00
Code

Revert "Revert "meson: use c_args in generator scripts (#10289)""

Browse Source 
This reverts commit 0e3cc902fa.

Fixes #10288.
I have confirmed that this does now fix cross-compilation.
It appears that changes upstream in Meson, probably mesonbuild/meson#5263, have made the original MR, #10289, work now.

This needs to be tested to ensure that it doesn't break Travis CI like when it was reverted in #10361.
This commit is contained in:
Jordan Williams 2023-10-11 13:32:49 -05:00 committed by Zbigniew Jędrzejewski-Szmek
parent 9ff6876555
commit 465104b4d4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meson.build
View File

@ -483,7 +483,7 @@ if cxx_cmd != ''
add_project_arguments(cxx.get_supported_arguments(basic_disabled_warnings), language : 'cpp') add_project_arguments(cxx.get_supported_arguments(basic_disabled_warnings), language : 'cpp')
endif endif
cpp = ' '.join(cc.cmd_array()) + ' -E' cpp = ' '.join(cc.cmd_array() + get_option('c_args')) + ' -E'
has_wstringop_truncation = cc.has_argument('-Wstringop-truncation') has_wstringop_truncation = cc.has_argument('-Wstringop-truncation')