diff options
| author | Daan De Meyer <daan.j.demeyer@gmail.com> | 2024-04-22 23:45:50 +0200 |
|---|---|---|
| committer | Daan De Meyer <daan.j.demeyer@gmail.com> | 2024-04-23 10:25:02 +0200 |
| commit | 388dcc785b4c86238a5ed71ea0db021deab416ce (patch) | |
| tree | d0188724ea4b81f13ae5205954dd6ca4f5c80806 | |
| parent | mkosi: Update to latest (diff) | |
| download | systemd-388dcc785b4c86238a5ed71ea0db021deab416ce.tar.xz systemd-388dcc785b4c86238a5ed71ea0db021deab416ce.zip | |
mkosi: Use -fdebug-prefix-map= instead of -ffile-prefix-map=
-ffile-prefix-map= implies -fmacro-prefix-map= which is incompatible
with our definition of PROJECT_FILE.
See https://github.com/systemd/systemd/issues/32417.
-fdebug-prefix-map= only affects debuginfo without affecting macros.
| -rwxr-xr-x | mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.build.chroot | 2 | ||||
| -rwxr-xr-x | mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.build.chroot | 2 |
2 files changed, 2 insertions, 2 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 79770c0d4f..fb3ca65ab3 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 @@ -34,7 +34,7 @@ SRCDEST="/usr/src/debug/systemd-$VERSION-${RELEASE}${DIST}.$ARCH" # TODO: Drop -U_FORTIFY_SOURCE when we switch to CentOS Stream 10. CFLAGS="$(rpm --define "_fortify_level 0" --undefine _lto_cflags --eval %build_cflags) -O${OPTIMIZATION:-0} -Wp,-U_FORTIFY_SOURCE" if ((WITH_DEBUG)); then - CFLAGS="$CFLAGS -ffile-prefix-map=../src=$SRCDEST" + CFLAGS="$CFLAGS -fdebug-prefix-map=../src=$SRCDEST" fi IFS= diff --git a/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.build.chroot b/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.build.chroot index 6d09779164..da4c1df556 100755 --- a/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.build.chroot +++ b/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.build.chroot @@ -40,7 +40,7 @@ SRCDEST="/usr/src/debug/systemd-$VERSION-${RELEASE}${DIST}.$ARCH" # EXTRA_CFLAGS="-O${OPTIMIZATION:-0} -Wp,-U_FORTIFY_SOURCE" EXTRA_CFLAGS="" if ((WITH_DEBUG)); then - EXTRA_CFLAGS="$EXTRA_CFLAGS -ffile-prefix-map=../src=$SRCDEST" + EXTRA_CFLAGS="$EXTRA_CFLAGS -fdebug-prefix-map=../src=$SRCDEST" fi build() { |