summaryrefslogtreecommitdiffstats
path: root/mkosi.images/system
diff options
context:
space:
mode:
authorDaan De Meyer <daan.j.demeyer@gmail.com>2024-04-17 15:38:24 +0200
committerDaan De Meyer <daan.j.demeyer@gmail.com>2024-04-17 15:38:24 +0200
commit7f1d7fed801181d7551965477c298ea083a260a4 (patch)
tree17138e7672b17dbdb7f970d02e4bd221050b873d /mkosi.images/system
parentmkosi: Set up -ffile-prefix-map= correctly when building debuginfo packages (diff)
downloadsystemd-7f1d7fed801181d7551965477c298ea083a260a4.tar.xz
systemd-7f1d7fed801181d7551965477c298ea083a260a4.zip
mkosi: Override build_cflags instead of _distro_extra_cflags
The latter is not supported on CentOS Stream 9.
Diffstat (limited to 'mkosi.images/system')
-rwxr-xr-xmkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.build.chroot2
1 files changed, 1 insertions, 1 deletions
diff --git a/mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.build.chroot b/mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.build.chroot
index bb6854c38f..a1f77bcc9b 100755
--- a/mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.build.chroot
+++ b/mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.build.chroot
@@ -57,7 +57,7 @@ rpmbuild \
$( ((WITH_DEBUG)) || echo "debug_package %{nil}") \
--define "version_override $VERSION" \
--define "release_override $RELEASE" \
- --define "_distro_extra_cflags $EXTRA_CFLAGS" \
+ --define "build_cflags $(rpm --eval %build_cflags) $EXTRA_CFLAGS" \
--define "meson_build %{shrink:%{__meson} compile -C %{_vpath_builddir} -j %{_smp_build_ncpus} %{nil}}" \
--define "meson_install %{shrink:DESTDIR=%{buildroot} %{__meson} install -C %{_vpath_builddir} --no-rebuild --quiet %{nil}}" \
--define "meson_extra_configure_options -D mode=developer -D b_sanitize=${SANITIZERS:-none}" \