aboutsummaryrefslogtreecommitdiff
path: root/Makefile.inc1
diff options
context:
space:
mode:
authorThomas Quinot <thomas@FreeBSD.org>2015-05-10 21:21:52 +0000
committerThomas Quinot <thomas@FreeBSD.org>2015-05-10 21:21:52 +0000
commit55b130956d63f4aa283b24b0db3dc3d61f6c0ec0 (patch)
tree2184d83b8147ea340c8f53c39d0f4a68f03f3136 /Makefile.inc1
parentdef4ea7f7891599b18f43c1ff51ede65e35e20bd (diff)
downloadsrc-55b130956d63f4aa283b24b0db3dc3d61f6c0ec0.tar.gz
src-55b130956d63f4aa283b24b0db3dc3d61f6c0ec0.zip
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
Notes
Notes: svn path=/head/; revision=282736
Diffstat (limited to 'Makefile.inc1')
-rw-r--r--Makefile.inc13
1 files changed, 3 insertions, 0 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index 213e1c68c9ba..942fad333c7f 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1361,6 +1361,9 @@ _kerberos5_bootstrap_tools= \
.ORDER: ${_kerberos5_bootstrap_tools:C/^/${_bt}-/g}
.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'.