diff options
| author | Jordan Williams <jordan@jwillikers.com> | 2023-10-11 20:32:49 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2023-10-12 12:24:57 +0200 |
| commit | 465104b4d40d0d22ad8669d7f8a1ebbbcbec9e6e (patch) | |
| tree | b3d788a5f556c031e7d67dc0861117fda691b5ab /meson.build | |
| parent | Merge pull request #29523 from keszybz/kernel-install-dtb-files (diff) | |
| download | systemd-465104b4d40d0d22ad8669d7f8a1ebbbcbec9e6e.tar.xz systemd-465104b4d40d0d22ad8669d7f8a1ebbbcbec9e6e.zip | |
Revert "Revert "meson: use c_args in generator scripts (#10289)""
This reverts commit 0e3cc902faec4f18d5fa606396f602b08bc94e27.
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.
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meson.build b/meson.build index b01dd9cd73..1517065db6 100644 --- a/meson.build +++ b/meson.build @@ -483,7 +483,7 @@ if cxx_cmd != '' add_project_arguments(cxx.get_supported_arguments(basic_disabled_warnings), language : 'cpp') 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') |