diff --git a/clisp.spec b/clisp.spec
index 07c2bc7..b9ba8dd 100644
--- a/clisp.spec
+++ b/clisp.spec
@@ -159,7 +159,7 @@ else
     CC="gcc"
 fi
 CC="${CC} -g ${RPM_OPT_FLAGS} -fno-strict-aliasing -fPIC -pipe"
-case "$RPM_ARCH" in
+case "$(uname -m)" in
     i[0-9]86)
 	    CC="${CC} -falign-functions=4 -mieee-fp -ffloat-store"  ;;
     arm*)   CC="${CC}"				;;
@@ -180,7 +180,7 @@ safety='-DSAFETY=3 -O'
 MYCFLAGS="${MYCFLAGS} -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
 MYCFLAGS="${MYCFLAGS} -D_GNU_SOURCE -Wno-unused -Wno-uninitialized"
 port=''
-case "$RPM_ARCH" in
+case "$(uname -m)" in
     i[0-9]86)
             MYCFLAGS="${MYCFLAGS} ${noexec}"			;;
     armv4l) MYCFLAGS="${MYCFLAGS} ${noexec}"
@@ -206,7 +206,12 @@ case "$RPM_ARCH" in
 esac
 export CC
 export MYCFLAGS
-unset cfi386 noexec nommap safety
+unset noexec nommap safety
+#
+# Report final architectures
+#
+echo $(uname -i -m -p) %_build_arch %_arch
+echo | $CC $MYCFLAGS -v -E - 2>&1 | grep /cc1
 #
 # Environment for the case of missing terminal
 #