Index: share/mk/bsd.compiler.mk
===================================================================
--- share/mk/bsd.compiler.mk
+++ share/mk/bsd.compiler.mk
@@ -210,10 +210,10 @@
 
 .else
 # Use CC's values
-X_COMPILER_TYPE=	${COMPILER_TYPE}
-X_COMPILER_VERSION=	${COMPILER_VERSION}
-X_COMPILER_FREEBSD_VERSION=	${COMPILER_FREEBSD_VERSION}
-X_COMPILER_FEATURES=	${COMPILER_FEATURES}
+${X_}COMPILER_TYPE=	${COMPILER_TYPE}
+${X_}COMPILER_VERSION=	${COMPILER_VERSION}
+${X_}COMPILER_FREEBSD_VERSION=	${COMPILER_FREEBSD_VERSION}
+${X_}COMPILER_FEATURES=	${COMPILER_FEATURES}
 .endif	# ${cc} == "CC" || (${cc} == "XCC" && ${XCC} != ${CC})
 
 # Export the values so sub-makes don't have to look them up again, using the
Index: share/mk/bsd.linker.mk
===================================================================
--- share/mk/bsd.linker.mk
+++ share/mk/bsd.linker.mk
@@ -95,10 +95,10 @@
 .endif
 .else
 # Use LD's values
-X_LINKER_TYPE=		${LINKER_TYPE}
-X_LINKER_VERSION=	${LINKER_VERSION}
-X_LINKER_FEATURES=	${LINKER_FEATURES}
-X_LINKER_FREEBSD_VERSION= ${LINKER_FREEBSD_VERSION}
+${X_}LINKER_TYPE=		${LINKER_TYPE}
+${X_}LINKER_VERSION=	${LINKER_VERSION}
+${X_}LINKER_FEATURES=	${LINKER_FEATURES}
+${X_}LINKER_FREEBSD_VERSION= ${LINKER_FREEBSD_VERSION}
 .endif	# ${ld} == "LD" || (${ld} == "XLD" && ${XLD} != ${LD})
 
 # Export the values so sub-makes don't have to look them up again, using the