diff --git a/CMakeLists.txt b/CMakeLists.txt
index bccb310a7..ef7a0c235 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1132,6 +1132,10 @@ if(NOT VOLKGNSSSDR_FOUND)
             set(VOLK_GNSSSDR_CMAKE_ARGS ${VOLK_GNSSSDR_CMAKE_ARGS}
                 -DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/cmake/Toolchains/oe-sdk_cross.cmake
             )
+        else()
+            set(VOLK_GNSSSDR_CMAKE_ARGS ${VOLK_GNSSSDR_CMAKE_ARGS}
+                -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
+            )
         endif()
     else()
         if(CMAKE_TOOLCHAIN_FILE)
@@ -1140,6 +1144,9 @@ if(NOT VOLKGNSSSDR_FOUND)
             )
         endif()
     endif()
+    if(CMAKE_SYSTEM_PROCESSOR MATCHES "^cortex")
+        set(CMAKE_SYSTEM_PROCESSOR arm-${CMAKE_SYSTEM_PROCESSOR})
+    endif()
     include(GNUInstallDirs)
     set(SUPPORTED_CPU_FEATURES_ARCH FALSE)
     if(CMAKE_SYSTEM_PROCESSOR MATCHES "^mips")
diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt
index 2c8351f65..d8e76d1a0 100644
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt
@@ -246,17 +246,21 @@ endif()
 # cpu_features
 option(ENABLE_OWN_CPUFEATURES "Force the building of the cpu_features library even if it is already installed" OFF)
 
+if(CMAKE_SYSTEM_PROCESSOR MATCHES "^cortex")
+    set(CMAKE_SYSTEM_PROCESSOR arm-${CMAKE_SYSTEM_PROCESSOR})
+endif()
+
 set(SUPPORTED_CPU_FEATURES_ARCH FALSE)
 if(CMAKE_SYSTEM_PROCESSOR MATCHES "^mips")
-  set(SUPPORTED_CPU_FEATURES_ARCH TRUE)
+    set(SUPPORTED_CPU_FEATURES_ARCH TRUE)
 elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
-  set(SUPPORTED_CPU_FEATURES_ARCH TRUE)
+    set(SUPPORTED_CPU_FEATURES_ARCH TRUE)
 elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64")
-  set(SUPPORTED_CPU_FEATURES_ARCH TRUE)
+    set(SUPPORTED_CPU_FEATURES_ARCH TRUE)
 elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64)|(AMD64|amd64)|(^i.86$)")
-  set(SUPPORTED_CPU_FEATURES_ARCH TRUE)
+    set(SUPPORTED_CPU_FEATURES_ARCH TRUE)
 elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)")
-  set(SUPPORTED_CPU_FEATURES_ARCH TRUE)
+    set(SUPPORTED_CPU_FEATURES_ARCH TRUE)
 endif()
 
 if(CMAKE_VERSION VERSION_GREATER 3.0 AND SUPPORTED_CPU_FEATURES_ARCH)
diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cpu_features/CMakeLists.txt b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cpu_features/CMakeLists.txt
index b5bf163a7..0aa941f68 100644
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cpu_features/CMakeLists.txt
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cpu_features/CMakeLists.txt
@@ -23,16 +23,6 @@ if(NOT CMAKE_BUILD_TYPE)
       FORCE)
 endif()
 
-# Workaround for cross-compilation with SDK
-if(DEFINED ENV{OECORE_TARGET_SYSROOT})
-  set(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/cmake/Toolchains/oe-sdk_cross.cmake)
-  set(CMAKE_CROSSCOMPILING ON)
-  include(${CMAKE_TOOLCHAIN_FILE})
-  if(CMAKE_SYSTEM_PROCESSOR MATCHES "^cortexa9hf")
-    set(CMAKE_SYSTEM_PROCESSOR arm-${CMAKE_SYSTEM_PROCESSOR})
-  endif()
-endif()
-
 # BUILD_TESTING is a standard CMake variable, but we declare it here to make it
 # prominent in the GUI.
 option(BUILD_TESTING "Enable test (depends on googletest)." OFF)