D39751.id120841.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D39751.id120841.diff
View Options

	diff --git a/tools/build/Makefile b/tools/build/Makefile
	--- a/tools/build/Makefile
	+++ b/tools/build/Makefile
	@@ -125,7 +125,11 @@
	CHACHA20INCS+= ${SRCTOP}/sys/crypto/chacha20/_chacha.h \
	${SRCTOP}/sys/crypto/chacha20/chacha.h

	+.if ${MACHINE} == "host"
	+_host_arch= ${_HOST_ARCH}
	+.else
	_host_arch=${MACHINE}
	+.endif
	.if ${_host_arch} == "x86_64"
	# bmake on Linux/mac often prints that instead of amd64
	_host_arch=amd64
	@@ -163,6 +167,9 @@
	.if ${.MAKE.OS} != "FreeBSD"
	.PATH: ${.CURDIR}/cross-build

	+# tar need this
	+INCS+= ${SRCTOP}/include/readpassphrase.h
	+
	# Needed by our sys/types.h wrapper
	SYSINCS+= ${SRCTOP}/sys/sys/bitcount.h

	@@ -191,10 +198,10 @@
	SRCS+= rpmatch.c

	.if ${.MAKE.OS} == "Linux"
	-# On Linux, glibc does not provide strlcpy,strlcat or strmode.
	+# glibc does not provide strlcpy, strlcat, or strmode.
	.PATH: ${LIBC_SRCTOP}/string
	SRCS+= strlcpy.c strlcat.c strmode.c
	-# On Linux, glibc provides ffs* but not fls*
	+# glibc provides ffs, but not fls
	SRCS+= fls.c flsl.c flsll.c
	# Compile the fgetln/fgetwln/closefrom fallback code from libbsd:
	SRCS+= fgetln_fallback.c fgetwln_fallback.c closefrom.c