diff --git a/gnu/usr.bin/gdb/Makefile.inc b/gnu/usr.bin/gdb/Makefile.inc
index 097975de312..30d677726a0 100644
--- a/gnu/usr.bin/gdb/Makefile.inc
+++ b/gnu/usr.bin/gdb/Makefile.inc
@@ -50,7 +50,7 @@ CFLAGS+= -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/edit
 # Some bits here currently rely on some of the linker-merging magic that happens
 # with -fcommon.  While this is the default right now, explicitly set -fcommon
 # so that it continues to build when the default flips.
-CFLAGS+= -fcommon
+CFCOMMONFLAG= -fcommon
 
 GENSRCS+= nm.h tm.h
 
diff --git a/share/mk/src.sys.mk b/share/mk/src.sys.mk
index addc115b8ab..61c51f200d3 100644
--- a/share/mk/src.sys.mk
+++ b/share/mk/src.sys.mk
@@ -37,7 +37,8 @@ __postrcconf_${var}:=	${MK_${var}:U-}${WITHOUT_${var}:Uno:Dyes}${WITH_${var}:Uno
 # The following should be removed no earlier than LLVM11 being imported into the
 # tree, to ensure we don't regress the build.  LLVM11 and GCC10 will switch the
 # default over to -fno-common, making this redundant.
-CFLAGS+=	-fno-common
+CFCOMMONFLAG?=	-fno-common
+CFLAGS+=	${CFCOMMONFLAG}
 
 # tempting, but bsd.compiler.mk causes problems this early
 # probably need to remove dependence on bsd.own.mk