Use BTOOLSDIR
This commit is contained in:
@@ -6,21 +6,22 @@
|
||||
all: cross-tools build-tools
|
||||
|
||||
UPDATE_DEPENDFILE= no
|
||||
.export UPDATE_DEPENDFILE
|
||||
|
||||
# we build for the pseudo machine "host"
|
||||
TARGET_MACHINE= host
|
||||
|
||||
HOST_MACHINE!= uname -m
|
||||
HOST_MACHINE_ARCH!= uname -p
|
||||
TOOLSDIR?= ${HOST_OBJTOP}/tools
|
||||
LEGACY_TOOLS?= ${TOOLSDIR}/legacy
|
||||
BTOOLSDIR?= ${HOST_OBJTOP}/tools
|
||||
LEGACY_TOOLS?= ${BTOOLSDIR}/legacy
|
||||
|
||||
BSENV= \
|
||||
unset MAKEOBJDIR; MAKEOBJDIRPREFIX=${TOOLSDIR} \
|
||||
MAKESYSPATH=${SRCTOP}/tools/build/mk:${SRCTOP}/share/mk \
|
||||
TARGET=${HOST_MACHINE} TARGET_ARCH=${HOST_MACHINE_ARCH} \
|
||||
WITHOUT_STAGING=1 STAGE_ROOT= \
|
||||
WORLDTMP=${TOOLSDIR} LEGACY_TOOLS=${LEGACY_TOOLS}
|
||||
unset MAKEOBJDIR; MAKEOBJDIRPREFIX=${BTOOLSDIR} \
|
||||
MAKESYSPATH=${SRCTOP}/tools/build/mk:${SRCTOP}/share/mk \
|
||||
TARGET=${HOST_MACHINE} TARGET_ARCH=${HOST_MACHINE_ARCH} \
|
||||
WITHOUT_STAGING=1 STAGE_ROOT= \
|
||||
WORLDTMP=${BTOOLSDIR} LEGACY_TOOLS=${LEGACY_TOOLS}
|
||||
|
||||
BSARGS= \
|
||||
DESTDIR= \
|
||||
@@ -32,7 +33,7 @@ BSARGS= \
|
||||
|
||||
legacy: .MAKE .META
|
||||
mkdir -p ${LEGACY_TOOLS}
|
||||
${MAKE} -C ${SRCTOP}/etc distrib-dirs DESTDIR=${TOOLSDIR} > $@2
|
||||
${MAKE} -C ${SRCTOP}/etc distrib-dirs DESTDIR=${BTOOLSDIR} > $@2
|
||||
${MAKE} -C ${SRCTOP}/etc distrib-dirs DESTDIR=${LEGACY_TOOLS} > $@
|
||||
${BSENV} ${MAKE} -C ${SRCTOP} -f Makefile.inc1 ${BSARGS} $@
|
||||
touch $@
|
||||
|
||||
Reference in New Issue
Block a user