diff --git a/lfs/gcc-14.2.0.PKGBUILD b/lfs/gcc-14.2.0.PKGBUILD
index 531454a..c2bd78f 100644
--- a/lfs/gcc-14.2.0.PKGBUILD
+++ b/lfs/gcc-14.2.0.PKGBUILD
@@ -17,9 +17,7 @@ src_prepare() {
 }
 
 src_build() {
-  old_cflags="$CFLAGS"
-  unset CFLAGS
-
+  leaf_clear_flags
   mkdir -v build
   pushd build > /dev/null
   ../configure --prefix=/usr            \
@@ -33,8 +31,6 @@ src_build() {
                --disable-fixincludes    \
                --with-system-zlib
   make
-
-  export CFLAGS="$old_cflags"
   popd
 }
 
@@ -48,7 +44,7 @@ src_check() {
       -e '/GOTPCREL/d'              -i ../gcc/testsuite/gcc.target/i386/fentryname3.c
 
   chown -R leaf .
-  env -u CFLAGS su leaf -c "PATH=$PATH make -k check"
+  su leaf -c "PATH=$PATH make -k check"
   ../contrib/test_summary | grep -A7 Summ
   popd
 }
diff --git a/lfs/glibc-2.41.PKGBUILD b/lfs/glibc-2.41.PKGBUILD
index 1ed3d70..bd47a2f 100644
--- a/lfs/glibc-2.41.PKGBUILD
+++ b/lfs/glibc-2.41.PKGBUILD
@@ -26,9 +26,7 @@ src_prepare() {
 }
 
 src_build() {
-  old_cflags="$CFLAGS"
-  unset CFLAGS
-
+  leaf_clear_flags
   mkdir -pv build
   cd build
   echo "rootsbindir=/usr/sbin" > configparms
@@ -39,8 +37,6 @@ src_build() {
                --disable-nscd                           \
                libc_cv_slibdir=/usr/lib
   make
-
-  export CFLAGS="$old_cflags"
 }
 
 _skip_test() {
@@ -52,15 +48,10 @@ _skip_test() {
 src_check() {
   _skip_test tst-lchmod io/Makefile
 
-  old_cflags="$CFLAGS"
-  unset CFLAGS
   make check
-  export CFLAGS="$old_cflags"
 }
 
 src_install() {
-  old_cflags="$CFLAGS"
-  unset CFLAGS
   cd "${srcdir}/build"
   install -d "${pkgdir}/etc"
   touch "${pkgdir}/etc/ld.so.conf"
@@ -121,8 +112,6 @@ src_install() {
   unset ZONEINFO
 
   install -m644 "${distdir}/${sources[3]}" "${pkgdir}/etc/ld.so.conf"
-
-  export CFLAGS="$old_cflags"
 }
 
 src_preinstall() {