From 0c639a9010c5ad4e3f36eeb984efde7aaee981be Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Tue, 4 Jun 2024 16:03:45 +0200 Subject: [PATCH] mkosi: Stop sourcing /etc/makepkg.conf We don't need this anymore since we now just do delayed evaluation of $CFLAGS in /etc/makepkg.conf and it imports $CFLAGS into the script environment which messes everything up. --- mkosi.images/system/mkosi.conf.d/10-arch/mkosi.build.chroot | 3 --- 1 file changed, 3 deletions(-) diff --git a/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.build.chroot b/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.build.chroot index 7c862d527c6..1f6e0c328cd 100755 --- a/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.build.chroot +++ b/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.build.chroot @@ -21,9 +21,6 @@ ln --symbolic "$BUILDDIR" "pkg/$ID/build" # Because we run with --noextract we are responsible for making sure the source files appear in src/. ln --symbolic . "pkg/$ID/src" -# shellcheck source=/dev/null -. /etc/makepkg.conf - MKOSI_CFLAGS="-O0 -Wp,-U_FORTIFY_SOURCE" if ((LLVM)); then # TODO: Remove -fno-sanitize-function when https://github.com/systemd/systemd/issues/29972 is fixed. -- 2.47.3