D21378.id61165.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D21378.id61165.diff
View Options

	Index: share/mk/bsd.sys.mk
	===================================================================
	--- share/mk/bsd.sys.mk
	+++ share/mk/bsd.sys.mk
	@@ -29,6 +29,15 @@
	CXXFLAGS+= -std=${CXXSTD}
	.endif

	+#
	+# Turn off -Werror for gcc 4.2.1. The compiler is on the glide path out of the
	+# system, and any warnings specific to it are no longer relevant as there are
	+# too many false positives.
	+#
	+.if ${COMPILER_VERSION} < 50000
	+NO_WERROR.gcc= yes
	+.endif
	+
	# -pedantic is problematic because it also imposes namespace restrictions
	#CFLAGS+= -pedantic
	.if defined(WARNS)
	Index: sys/conf/kern.pre.mk
	===================================================================
	--- sys/conf/kern.pre.mk
	+++ sys/conf/kern.pre.mk
	@@ -93,7 +93,11 @@
	.if defined(CFLAGS_ARCH_PARAMS)
	CFLAGS.gcc+=${CFLAGS_ARCH_PARAMS}
	.endif
	-WERROR?= -Werror
	+.if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} < 50000
	+WERROR?= -Wno-error
	+.else
	+WERROR?= -Werror
	+.endif

	# XXX LOCORE means "don't declare C stuff" not "for locore.s".
	ASM_CFLAGS= -x assembler-with-cpp -DLOCORE ${CFLAGS} ${ASM_CFLAGS.${.IMPSRC:T}}
	Index: sys/conf/kmod.mk
	===================================================================
	--- sys/conf/kmod.mk
	+++ sys/conf/kmod.mk
	@@ -107,7 +107,12 @@
	.if !empty(CFLAGS:M-O[23s]) && empty(CFLAGS:M-fno-strict-aliasing)
	CFLAGS+= -fno-strict-aliasing
	.endif
	+.if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} < 50000
	+WERROR?= -Wno-error
	+.else
	WERROR?= -Werror
	+.endif
	+
	CFLAGS+= ${WERROR}
	CFLAGS+= -D_KERNEL
	CFLAGS+= -DKLD_MODULE