D14998.id41221.diff
No OneTemporary
Actions

Size

873 B

Referenced Files

None

Subscribers

None

D14998.id41221.diff
View Options

	Index: share/mk/bsd.sys.mk
	===================================================================
	--- share/mk/bsd.sys.mk
	+++ share/mk/bsd.sys.mk
	@@ -226,6 +226,8 @@
	CFLAGS+= ${CFLAGS.${.IMPSRC:T}}
	CXXFLAGS+= ${CXXFLAGS.${.IMPSRC:T}}

	+LDFLAGS+= ${LDFLAGS.${LINKER_TYPE}}
	+
	.if defined(SRCTOP)
	# Prevent rebuilding during install to support read-only objdirs.
	.if ${.TARGETS:Minstall} == ${.TARGETS} && empty(.MAKE.MODE:Mmeta)
	Index: stand/i386/Makefile.inc
	===================================================================
	--- stand/i386/Makefile.inc
	+++ stand/i386/Makefile.inc
	@@ -2,13 +2,9 @@
	#
	# $FreeBSD$

	-.sinclude <bsd.linker.mk>
	-
	LOADER_ADDRESS?=0x200000
	LDFLAGS+= -nostdlib
	-.if defined(LINKER_TYPE) && ${LINKER_TYPE} == "lld"
	-LDFLAGS+= -Wl,--no-rosegment
	-.endif
	+LDFLAGS.lld+= -Wl,--no-rosegment

	# BTX components
	BTXDIR= ${BOOTOBJ}/i386/btx