summaryrefslogtreecommitdiffstats
path: root/Makefile.inc1
diff options
context:
space:
mode:
authorLuiz Otavio O Souza <luiz@netgate.com>2015-09-15 15:53:04 -0500
committerLuiz Otavio O Souza <luiz@netgate.com>2015-10-20 12:03:37 -0500
commite400455deb0c5717b85fd4747795cd7749fbd953 (patch)
tree6233f75fe7943705afa0d76fb405bdfb9b4f23f5 /Makefile.inc1
parentfbbde3a0d1cef7642b2575e0b008ab41c519809c (diff)
downloadFreeBSD-src-e400455deb0c5717b85fd4747795cd7749fbd953.zip
FreeBSD-src-e400455deb0c5717b85fd4747795cd7749fbd953.tar.gz
MFC r282736:
Unbreak build following rev. 282726 (Makefile.inc1): add dependency of xinstall on libmd to avoid failure of parallel bootstrap. (lib/libmd/*.h): do not redefine symbols if already defined as macros (libcrypt uses the same sources internally, redefining symbols with a prefix of its own). Fixes build failures caused by previous change to libmd. Reported by: ian Pointy hat to: thomas TAG: IPSEC-HEAD Issue: #4841
Diffstat (limited to 'Makefile.inc1')
-rw-r--r--Makefile.inc14
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index 27b44db..679ec28 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1345,6 +1345,10 @@ _texinfo= gnu/usr.bin/texinfo/libtxi \
${_bt}-gnu/usr.bin/texinfo/install-info: ${_bt}-gnu/usr.bin/texinfo/libtxi
${_bt}-gnu/usr.bin/texinfo/makeinfo: ${_bt}-gnu/usr.bin/texinfo/libtxi
.endif
+
+# Rebuild up-to-date libmd for xinstall
+${_bt}-usr.bin/xinstall: ${_bt}-lib/libmd
+
bootstrap-tools: .PHONY
# Please document (add comment) why something is in 'bootstrap-tools'.
OpenPOWER on IntegriCloud