diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2015-11-25 19:10:28 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2015-11-25 19:10:28 +0000 |
| commit | 7b3ea376a27ada7a61eb0c3102f13040fb8c16cb (patch) | |
| tree | 08f8b8cb9695c3838114009d59775d79359e66ef /targets/pseudo/bootstrap-tools | |
| parent | a9bf7044742bffcdb6acf68904059d7e41cbf6ad (diff) | |
| download | src-7b3ea376a27ada7a61eb0c3102f13040fb8c16cb.tar.gz src-7b3ea376a27ada7a61eb0c3102f13040fb8c16cb.zip | |
META MODE: Prefer INSTALL=tools/install.sh to lessen the need for xinstall.host.
This both avoids some dependencies on xinstall.host and allows
bootstrapping on older releases to work due to lack of at least 'install -l'
support.
Sponsored by: EMC / Isilon Storage Division
Notes
Notes:
svn path=/head/; revision=291307
Diffstat (limited to 'targets/pseudo/bootstrap-tools')
| -rw-r--r-- | targets/pseudo/bootstrap-tools/Makefile | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/targets/pseudo/bootstrap-tools/Makefile b/targets/pseudo/bootstrap-tools/Makefile index aa6166c85ef0..a9cdfe5ee9d8 100644 --- a/targets/pseudo/bootstrap-tools/Makefile +++ b/targets/pseudo/bootstrap-tools/Makefile @@ -20,7 +20,8 @@ BSENV= \ MAKESYSPATH=${SRCTOP}/tools/build/mk:${SRCTOP}/share/mk \ TARGET=${HOST_MACHINE} TARGET_ARCH=${HOST_MACHINE_ARCH} \ WITHOUT_STAGING=1 STAGE_ROOT= BOOTSTRAPPING_TOOLS=1 \ - WORLDTMP=${BTOOLSDIR} LEGACY_TOOLS=${LEGACY_TOOLS} + WORLDTMP=${BTOOLSDIR} LEGACY_TOOLS=${LEGACY_TOOLS} \ + INSTALL="sh ${SRCTOP}/tools/install.sh" .if !defined(OSRELDATE) ord_h= /usr/include/osreldate.h @@ -41,11 +42,12 @@ BSARGS= DESTDIR= \ MK_LLDB=no MK_TESTS=no \ MK_INCLUDES=yes +DISTRIB_ENV= INSTALL="sh ${SRCTOP}/tools/install.sh" NO_FSCHG=1 legacy: .MAKE .META mkdir -p ${LEGACY_TOOLS} - ${MAKE} -C ${SRCTOP}/etc distrib-dirs -DNO_FSCHG DESTDIR=${BTOOLSDIR} \ - > $@.distrib-dirs_btoolsdir - ${MAKE} -C ${SRCTOP}/etc distrib-dirs -DNO_FSCHG \ + ${DISTRIB_ENV} ${MAKE} -C ${SRCTOP}/etc distrib-dirs \ + DESTDIR=${BTOOLSDIR} > $@.distrib-dirs_btoolsdir + ${DISTRIB_ENV} ${MAKE} -C ${SRCTOP}/etc distrib-dirs \ DESTDIR=${LEGACY_TOOLS} > $@.distrib-dirs_legacy_tools ${BSENV} ${MAKE} -C ${SRCTOP} -f Makefile.inc1 ${BSARGS} $@ touch $@ |