diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2015-11-18 21:37:46 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2015-11-18 21:37:46 +0000 |
| commit | c372459ab7e169df7357365b8580caf0e2ab7356 (patch) | |
| tree | 644588602962371bb16c989530d000d56d254153 | |
| parent | cf0d26dcd6f3ae0595b32f615c52e365a58478c0 (diff) | |
| download | FreeBSD-src-c372459ab7e169df7357365b8580caf0e2ab7356.zip FreeBSD-src-c372459ab7e169df7357365b8580caf0e2ab7356.tar.gz | |
Remove unneeded libmd from bootstrap-tools (reverting r246784).
The bootstrap-tools are supposed to be host tools, which in most cases, use
host headers and libraries. As such, directly including the src tree's headers
for libmd here causes the need to link libmd in since it will be built with
the new symbols (which /usr/lib/libmd.so) won't have unless it is new enough.
During the target build in buildworld the target headers are staged into
WORLDTMP and used via --sysroot, allowing the target xinstall to be built with
the new/target libmd.
The .PATH here was also not doing anything since xinstall does not use libmd
source files.
Sponsored by: EMC / Isilon Storage Division
MFC after: 2 weeks
| -rw-r--r-- | Makefile.inc1 | 4 | ||||
| -rw-r--r-- | usr.bin/xinstall/Makefile | 2 |
2 files changed, 0 insertions, 6 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index d9f01be..cc48d20 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1458,9 +1458,6 @@ ${_bt}-usr.bin/mandoc: ${_bt}-lib/libopenbsd ${_bt}-lib/libsqlite3 _makewhatis=usr.bin/makewhatis .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'. @@ -1483,7 +1480,6 @@ bootstrap-tools: .PHONY ${_yacc} \ ${_m4} \ ${_lex} \ - lib/libmd \ usr.bin/xinstall \ ${_gensnmptree} \ usr.sbin/config \ diff --git a/usr.bin/xinstall/Makefile b/usr.bin/xinstall/Makefile index 1d39273..c1056b5 100644 --- a/usr.bin/xinstall/Makefile +++ b/usr.bin/xinstall/Makefile @@ -7,10 +7,8 @@ SRCS= xinstall.c getid.c MAN= install.1 .PATH: ${.CURDIR}/../../contrib/mtree -.PATH: ${.CURDIR}/../../lib/libmd CFLAGS+= -I${.CURDIR}/../../contrib/mtree CFLAGS+= -I${.CURDIR}/../../lib/libnetbsd -CFLAGS+= -I${.CURDIR}/../../lib/libmd LIBADD= md |
