diff --git a/env/target-any.mk b/env/target-any.mk
index d735b2fd9..ace3c87c6 100644
--- a/env/target-any.mk
+++ b/env/target-any.mk
@@ -79,6 +79,8 @@ cflags += -Wno-tautological-overlap-compare
 cflags += -fmessage-length=0
 cflags += -ferror-limit=0
 cflags += -ftemplate-backtrace-limit=0
+cflags += -fmacro-backtrace-limit=0
+cflags += -fdiagnostics-show-note-include-stack
 
 beta := false