D52959.1789644203.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D52959.1789644203.diff
View Options

	diff --git a/share/mk/bsd.debug.mk b/share/mk/bsd.debug.mk
	--- a/share/mk/bsd.debug.mk
	+++ b/share/mk/bsd.debug.mk
	@@ -16,7 +16,7 @@
	# If reproducible build mode is enabled, map the root of the source
	# directory to /usr/src and the root of the object directory to
	# /usr/obj.
	-.if ${MK_REPRODUCIBLE_BUILD} != "no" && !defined(DEBUG_PREFIX)
	+.if ${MK_REPRODUCIBLE_PATHS} != "no" && !defined(DEBUG_PREFIX)
	.if defined(SRCTOP)
	DEBUG_PREFIX+= ${SRCTOP:S,/$,,}=/usr/src
	.endif
	diff --git a/sys/conf/kern.opts.mk b/sys/conf/kern.opts.mk
	--- a/sys/conf/kern.opts.mk
	+++ b/sys/conf/kern.opts.mk
	@@ -56,6 +56,7 @@
	KERNEL_RETPOLINE \
	RATELIMIT \
	REPRODUCIBLE_BUILD \
	+ REPRODUCIBLE_PATHS \
	VERIEXEC

	# Some options are totally broken on some architectures. We disable them. If you
	diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk
	--- a/sys/conf/kern.post.mk
	+++ b/sys/conf/kern.post.mk
	@@ -372,7 +372,7 @@
	_ILINKS+= i386
	.endif

	-.if ${MK_REPRODUCIBLE_BUILD} != "no"
	+.if ${MK_REPRODUCIBLE_PATHS} != "no"
	PREFIX_SYSDIR=/usr/src/sys
	PREFIX_OBJDIR=/usr/obj/usr/src/${MACHINE}.${MACHINE_CPUARCH}/sys/${KERN_IDENT}
	CFLAGS+= -ffile-prefix-map=${SYSDIR}=${PREFIX_SYSDIR}
	diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk
	--- a/sys/conf/kmod.mk
	+++ b/sys/conf/kmod.mk
	@@ -303,7 +303,7 @@
	beforedepend: ${_ILINKS}
	beforebuild: ${_ILINKS}

	-.if ${MK_REPRODUCIBLE_BUILD} != "no"
	+.if ${MK_REPRODUCIBLE_PATHS} != "no"
	PREFIX_SYSDIR=/usr/src/sys
	CFLAGS+= -ffile-prefix-map=${SYSDIR}=${PREFIX_SYSDIR}
	.if defined(KERNBUILDDIR)