diff --git a/build/configs/toolchain_linux_armv7l-el.cmake b/build/configs/toolchain_linux_armv7l-el.cmake
index 13f06769a..7ae74d3d5 100644
--- a/build/configs/toolchain_linux_armv7l-el.cmake
+++ b/build/configs/toolchain_linux_armv7l-el.cmake
@@ -17,5 +17,7 @@ set(CMAKE_SYSTEM_PROCESSOR armv7l-el)
 
 set(CMAKE_C_COMPILER arm-linux-gnueabi-gcc)
 set(CMAKE_CXX_COMPILER arm-linux-gnueabi-g++)
+# FIXME: This could break cross compilation, when the strip is not for the target architecture
+find_program(CMAKE_STRIP NAMES arm-linux-gnueabi-strip strip)
 
 set(FLAGS_COMMON_ARCH -mlittle-endian -mthumb)
diff --git a/build/configs/toolchain_linux_armv7l-hf.cmake b/build/configs/toolchain_linux_armv7l-hf.cmake
index a5205a510..80ebe41ed 100644
--- a/build/configs/toolchain_linux_armv7l-hf.cmake
+++ b/build/configs/toolchain_linux_armv7l-hf.cmake
@@ -17,7 +17,8 @@ set(CMAKE_SYSTEM_PROCESSOR armv7l-hf)
 
 set(CMAKE_C_COMPILER arm-linux-gnueabihf-gcc)
 set(CMAKE_CXX_COMPILER arm-linux-gnueabihf-g++)
-
+# FIXME: This could break cross compilation, when the strip is not for the target architecture
+find_program(CMAKE_STRIP NAMES arm-linux-gnueabihf-strip strip)
 #
 # Limit fpu to VFPv3 with d0-d15 registers
 #