diff --git a/make/defs-cpp.mk b/make/defs-cpp.mk
index 983d5e8c..bd125c2f 100644
--- a/make/defs-cpp.mk
+++ b/make/defs-cpp.mk
@@ -3,7 +3,11 @@
 COMPILER_SUITE              ?= gcc
 CPP_STANDARD_VERSION        ?= 17
 C_STANDARD_VERSION          ?= 11
-LIBTYPE                     ?= shared
+ifeq ($(TARGET_TRIPLET),arm-none-eabi)
+  LIBTYPE                   ?= static
+else
+  LIBTYPE                   ?= shared
+endif
 
 ifeq ($(COMPILER_SUITE),gcc)
   DEBUGGER                  ?= gdb
@@ -127,8 +131,11 @@ ifeq ($(TARGET_ARCH),x86_64)
 endif
 
 ifeq ($(TARGET_TRIPLET),arm-none-eabi)
+  USE_DISABLE_COMPILER_OPTIMISATION_OPTS = false
   BUILD_CFLAGS              += -mcpu=cortex-m3 -mthumb
   BUILD_CPPFLAGS            += -mcpu=cortex-m3 -mthumb
+  BUILD_CPPFLAGS            += -fno-exceptions
+  BUILD_CPPFLAGS            += -fno-rtti
 endif
 
 ifeq ($(COMPILER_SUITE),gcc)
@@ -289,7 +296,7 @@ ifeq ($(USE_GFILTER),true)
 endif
 
 ifeq ($(USE_PROJECT_LIB),true)
-  PROJECTLIB_LDFLAGS  += -L$(TOPDIR)/lib -l$(LIBNAME)
+  PROJECTLIB_LDFLAGS        += -L$(TOPDIR)/lib -l$(LIBNAME)
 endif
 
 ifneq ($(filter jw-build,$(PREREQ_BUILD)),)
@@ -409,7 +416,7 @@ ifeq ($(USE_STACK_CHECK),true)
 endif
 
 ifeq ($(USE_COMPILER_DEBUG_OPTS),true)
-  #BUILD_EXTRA_DEBUG_FLAGS   += -gdwarf-2
+  #BUILD_EXTRA_DEBUG_FLAGS  += -gdwarf-2
   BUILD_CFLAGS              += -g3 $(BUILD_EXTRA_DEBUG_FLAGS)
   BUILD_CPPFLAGS            += -g3 $(BUILD_EXTRA_DEBUG_FLAGS)
   BUILD_LDFLAGS             += -g3 $(BUILD_EXTRA_DEBUG_FLAGS)