diff options
author | Simon J. Gerraty <sjg@FreeBSD.org> | 2019-10-28 20:45:29 +0000 |
---|---|---|
committer | Simon J. Gerraty <sjg@FreeBSD.org> | 2019-10-28 20:45:29 +0000 |
commit | 17adf17b30715c119dee738414010973a6bc8ce1 (patch) | |
tree | cce8bf87205b05be2a6436b06f2a165044791d54 | |
parent | 484456b2d8b8c0f99fb280f0d7477f328a0c9c04 (diff) | |
download | src-17adf17b30715c119dee738414010973a6bc8ce1.tar.gz src-17adf17b30715c119dee738414010973a6bc8ce1.zip |
Building head on stable/11 requires libzstd
Add lib/libzstd to _elftoolchain_libs
tools/build/Makefile needs to create the install dir for libzstd
Since this would make the line too long, rework to use a list
in one per line format (easier to add in future)
and dispense with the .for loop
Reviewed by: emaste bapt
Differential Revision: https://reviews.freebsd.org/D220134
Notes
Notes:
svn path=/head/; revision=354138
-rw-r--r-- | Makefile.inc1 | 5 | ||||
-rw-r--r-- | tools/build/Makefile | 13 |
2 files changed, 12 insertions, 6 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 7f8192e8d272..9f75dba90bb2 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1697,7 +1697,7 @@ buildkernel: .MAKE .PHONY @echo "--------------------------------------------------------------" @echo ">>> Kernel build for ${_kernel} completed on `LC_ALL=C date`" @echo "--------------------------------------------------------------" - + .endfor @seconds=$$(($$(date '+%s') - ${_BUILDKERNEL_START})); \ echo -n ">>> Kernel(s) ${BUILDKERNELS} built in $$seconds seconds, "; \ @@ -2159,7 +2159,7 @@ _bootstrap_tools_links+=m4 lex # r339083 libelf: correct mips64el test to use ELF header # r348347 Add missing powerpc64 relocation support to libdwarf .if ${BOOTSTRAPPING} < 1300030 -_elftoolchain_libs= lib/libelf lib/libdwarf +_elftoolchain_libs= lib/libelf lib/libdwarf lib/libzstd ${_bt}-lib/libelf: ${_bt_m4_depend} ${_bt}-lib/libdwarf: ${_bt_m4_depend} .endif @@ -2361,7 +2361,6 @@ ${_bt}-link-${_tool}: .PHONY .MAKE ${_bt}-links: ${_bt}-link-${_tool} .endfor - bootstrap-tools: ${_bt}-links .PHONY # Please document (add comment) why something is in 'bootstrap-tools'. diff --git a/tools/build/Makefile b/tools/build/Makefile index 0fb25fc8a173..b912604b04e3 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -120,10 +120,17 @@ host-symlinks: # Create all the directories that are needed during the legacy, bootstrap-tools # and cross-tools stages. We do this here using mkdir since mtree may not exist # yet (this happens if we are crossbuilding from Linux/Mac). +INSTALLDIR_LIST= \ + bin \ + lib/casper \ + lib/geom \ + usr/include/casper \ + usr/include/private/zstd \ + usr/lib \ + installdirs: -.for _dir in bin usr/lib usr/include usr/include/casper lib/geom lib/casper - mkdir -p "${DESTDIR}/${_dir}" -.endfor + mkdir -p ${INSTALLDIR_LIST:S,^,${DESTDIR}/,} + # Link usr/bin, sbin, and usr/sbin to bin so that it doesn't matter whether a # bootstrap tool was added to WORLTMP with a symlink or by building it in the # bootstrap-tools phase. We could also overrride BINDIR when building bootstrap |