diff --git a/builddefs/common_rules.mk b/builddefs/common_rules.mk
index d6f91b10e4f..6ba42f3b5bc 100644
--- a/builddefs/common_rules.mk
+++ b/builddefs/common_rules.mk
@@ -50,10 +50,10 @@ ifeq ($(strip $(DEBUG_ENABLE)),yes)
 	CFLAGS 	 += -ggdb3
 	CXXFLAGS += -ggdb3
 	ASFLAGS  += -ggdb3
-# Create a map file when debugging
-	LDFLAGS  += -Wl,-Map=$(BUILD_DIR)/$(TARGET).map,--cref
 endif
 
+# Always create a map file to see what was compiled and where.
+LDFLAGS  += -Wl,-Map=$(BUILD_DIR)/$(TARGET).map,--cref
 
 #---------------- C Compiler Options ----------------