diff --git a/CMakeLists.txt b/CMakeLists.txt
index 889c6e09c..13cbeb617 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3485,7 +3485,7 @@ message(STATUS "*           SUMMARY REPORT            *")
 message(STATUS "***************************************")
 message(STATUS "")
 if(CMAKE_CROSSCOMPILING)
-    message(STATUS "Cross-compiling on ${LINUX_DISTRIBUTION} ${LINUX_VER} (${CMAKE_HOST_SYSTEM_PROCESSOR}) for ${CMAKE_SYSTEM_PROCESSOR} ${ARCHITECTURE_STRING}")
+    message(STATUS "Cross-compiling on ${LINUX_DISTRIBUTION} ${LINUX_VER} (${CMAKE_HOST_SYSTEM_PROCESSOR}) for ${CMAKE_SYSTEM_PROCESSOR}")
 else()
     if(${CMAKE_SYSTEM_NAME} MATCHES "Linux|kFreeBSD|GNU")
         message(STATUS "Building on GNU/Linux ${LINUX_DISTRIBUTION} ${LINUX_VER} ${ARCHITECTURE_STRING}")
@@ -3508,7 +3508,7 @@ file(APPEND ${GNSSSDR_BINARY_DIR}/features.log "********************************
 file(APPEND ${GNSSSDR_BINARY_DIR}/features.log "GNSS-SDR version: ${VERSION}\n")
 if(${CMAKE_SYSTEM_NAME} MATCHES "Linux|kFreeBSD|GNU")
     if(CMAKE_CROSSCOMPILING)
-        file(APPEND ${GNSSSDR_BINARY_DIR}/features.log "Cross-compiling on ${LINUX_DISTRIBUTION} ${LINUX_VER} (${CMAKE_HOST_SYSTEM_PROCESSOR}) for ${CMAKE_SYSTEM_PROCESSOR} ${ARCHITECTURE_STRING}\n")
+        file(APPEND ${GNSSSDR_BINARY_DIR}/features.log "Cross-compiling on ${LINUX_DISTRIBUTION} ${LINUX_VER} (${CMAKE_HOST_SYSTEM_PROCESSOR}) for ${CMAKE_SYSTEM_PROCESSOR}\n")
     else()
         file(APPEND ${GNSSSDR_BINARY_DIR}/features.log "Building on GNU/Linux ${LINUX_DISTRIBUTION} ${LINUX_VER} ${ARCHITECTURE_STRING}\n")
     endif()
diff --git a/cmake/Modules/DetectLinuxDistro.cmake b/cmake/Modules/DetectLinuxDistro.cmake
index 3fa556ba4..014b2a8d3 100644
--- a/cmake/Modules/DetectLinuxDistro.cmake
+++ b/cmake/Modules/DetectLinuxDistro.cmake
@@ -4,10 +4,14 @@
 # SPDX-FileCopyrightText: 2011-2020 C. Fernandez-Prades cfernandez(at)cttc.es
 # SPDX-License-Identifier: BSD-3-Clause
 
-if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-    set(ARCHITECTURE_STRING "(64 bits)")
+if(CMAKE_VERSION VERSION_LESS 3.19)
+    if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+        set(ARCHITECTURE_STRING "(64 bits)")
+    else()
+        set(ARCHITECTURE_STRING "(32 bits)")
+    endif()
 else()
-    set(ARCHITECTURE_STRING "(32 bits)")
+    set(ARCHITECTURE_STRING "(${CMAKE_HOST_SYSTEM_PROCESSOR})")
 endif()
 
 if(EXISTS "/etc/lsb-release")