diff --git a/boards/native/Makefile.include b/boards/native/Makefile.include
index 9b2b89c78a87..615a09a1d189 100644
--- a/boards/native/Makefile.include
+++ b/boards/native/Makefile.include
@@ -52,8 +52,10 @@ ifeq ($(OS_ARCH),x86_64)
 endif
 ifeq ($(OS),FreeBSD)
   ifeq ($(OS_ARCH),amd64)
-    ifeq ($(DISABLE_LIBSTDCPP),1)
-      LINKFLAGS += -nodefaultlibs -lgcc_s -lc -lc++ -lm -lpthread
+    ifeq (,$(filter libstdcpp,$(FEATURES_USED)))
+      ifneq (,$(filter cpp,$(FEATURES_USED)))
+        LINKFLAGS += -nodefaultlibs -lgcc_s -lc -lc++ -lm -lpthread
+      endif
     endif
     LINKFLAGS += -m32 -DCOMPAT_32BIT -L/usr/lib32 -B/usr/lib32
   endif