]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
mkosi: Stop sourcing /etc/makepkg.conf 33199/head
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Tue, 4 Jun 2024 14:03:45 +0000 (16:03 +0200)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Tue, 4 Jun 2024 14:03:45 +0000 (16:03 +0200)
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

index 7c862d527c6bba1c60d1cc9899b5330363d95656..1f6e0c328cd123c9581077f569cd4aa6aed909e9 100755 (executable)
@@ -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.