diff --git a/alarm/kodi-rpi/PKGBUILD b/alarm/kodi-rpi/PKGBUILD
index 6778d637c..62d6f8e39 100644
--- a/alarm/kodi-rpi/PKGBUILD
+++ b/alarm/kodi-rpi/PKGBUILD
@@ -116,22 +116,20 @@ build() {
   # uses here so unset them and redefine below
   unset CFLAGS CXXFLAGS
 
-  CFLAGS="-O2 -pipe -fstack-protector-strong -fno-plt -fexceptions -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -fstack-clash-protection"
-  CXXFLAGS="${CFLAGS} -Wp,-D_GLIBCXX_ASSERTIONS"
-
   if [[ $CARCH = "armv7h" ]]; then
     # we use -mcpu=cortex-a53 rather than cortex-a72 to maximize RPi 3B and RPi 4B/400 compatibility
     # in a single package which is consistent with how LibreELEC is currently built, see:
     # https://github.com/LibreELEC/LibreELEC.tv/commit/8e6605f6da56f25a00272b1cbacb93d40200153f#commitcomment-46341034
-    export CFLAGS+=" -mcpu=cortex-a53 -mfpu=neon-fp-armv8 -mfloat-abi=hard"
-    export CXXFLAGS="${CFLAGS}"
+    CFLAGS="-mcpu=cortex-a53 -mfpu=neon-fp-armv8 -mfloat-abi=hard"
   elif [[ $CARCH = "aarch64" ]]; then
     # note that we use a value of cortex-a53 here to allow RPi3 and RPi4 to use the same package
     # consistent with rationale of previous comment
-    export CFLAGS+=" -mcpu=cortex-a53"
-    export CXXFLAGS="${CFLAGS}"
+    CFLAGS="-mcpu=cortex-a53"
   fi
 
+  export CFLAGS+=" -O2 -pipe -fstack-protector-strong -fno-plt -fexceptions -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -fstack-clash-protection"
+  export CXXFLAGS+="${CFLAGS} -Wp,-D_GLIBCXX_ASSERTIONS"
+
   _args=(
     -DCMAKE_BUILD_TYPE=Release
     -DCMAKE_INSTALL_PREFIX=/usr