d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reduce MAKEOBJDIRPREFIX path spam by specifying a direct objdir to use.

Browse Source 
Sponsored by:	Dell EMC Isilon
This commit is contained in:
Bryan Drewery 2017-11-02 18:08:36 +00:00
parent 47902a71f3
commit 4dc89c4d51
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.inc1
View File

@ -521,6 +521,8 @@ BMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \
MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}"
# need to keep this in sync with targets/pseudo/bootstrap-tools/Makefile # need to keep this in sync with targets/pseudo/bootstrap-tools/Makefile
BSARGS= DESTDIR= \ BSARGS= DESTDIR= \
OBJTOP='${WORLDTMP}/obj-$${BWPHASE}' \
OBJROOT='$${OBJTOP}/' \
BOOTSTRAPPING=${OSRELDATE} \ BOOTSTRAPPING=${OSRELDATE} \
BWPHASE=${.TARGET:C,^_,,} \ BWPHASE=${.TARGET:C,^_,,} \
SSP_CFLAGS= \ SSP_CFLAGS= \
@ -531,7 +533,7 @@ BSARGS= DESTDIR= \
MK_LLDB=no MK_TESTS=no \ MK_LLDB=no MK_TESTS=no \
MK_INCLUDES=yes MK_INCLUDES=yes
BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \ BMAKE= \
${BMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \ ${BMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \
${BSARGS} ${BSARGS}
@ -558,9 +560,11 @@ XMAKE= ${BMAKE} \
KTMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \ KTMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \
PATH=${BPATH}:${PATH} \ PATH=${BPATH}:${PATH} \
WORLDTMP=${WORLDTMP} WORLDTMP=${WORLDTMP}
KTMAKE= TOOLS_PREFIX=${WORLDTMP} MAKEOBJDIRPREFIX=${WORLDTMP} \ KTMAKE= TOOLS_PREFIX=${WORLDTMP} \
${KTMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \ ${KTMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \
DESTDIR= \ DESTDIR= \
OBJTOP='${WORLDTMP}/obj-kernel-tools' \
OBJROOT='$${OBJTOP}/' \
BOOTSTRAPPING=${OSRELDATE} \ BOOTSTRAPPING=${OSRELDATE} \
SSP_CFLAGS= \ SSP_CFLAGS= \
MK_HTML=no -DNO_LINT MK_MAN=no \ MK_HTML=no -DNO_LINT MK_MAN=no \

6
Makefile.libcompat
View File

@ -108,7 +108,8 @@ LIBCOMPATCXXFLAGS+= -isystem ${LIBCOMPATTMP}/usr/include/c++/v1 -std=c++11 \
# Yes, the flags are redundant. # Yes, the flags are redundant.
LIBCOMPATWMAKEENV+= \ LIBCOMPATWMAKEENV+= \
MAKEOBJDIRPREFIX=${LIBCOMPAT_OBJTOP} \ OBJTOP=${LIBCOMPAT_OBJTOP} \
OBJROOT='$${OBJTOP}/' \
INSTALL="sh ${.CURDIR}/tools/install.sh" \ INSTALL="sh ${.CURDIR}/tools/install.sh" \
PATH=${TMPPATH} \ PATH=${TMPPATH} \
SYSROOT=${LIBCOMPATTMP} \ SYSROOT=${LIBCOMPATTMP} \
@ -184,7 +185,8 @@ build${libcompat}: .PHONY
${_+_}cd ${.CURDIR}/${_dir}; \ ${_+_}cd ${.CURDIR}/${_dir}; \
WORLDTMP=${WORLDTMP} \ WORLDTMP=${WORLDTMP} \
MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" \ MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" \
MAKEOBJDIRPREFIX=${LIBCOMPAT_OBJTOP} \ OBJTOP=${LIBCOMPAT_OBJTOP} \
OBJROOT='$${OBJTOP}/' \
${MAKE} SSP_CFLAGS= DESTDIR= \ ${MAKE} SSP_CFLAGS= DESTDIR= \
DIRPRFX=${_dir}/ -DNO_LINT -DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \ DIRPRFX=${_dir}/ -DNO_LINT -DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \
build-tools build-tools

6
targets/pseudo/bootstrap-tools/Makefile
View File

@ -13,10 +13,10 @@ TARGET_MACHINE= host
HOST_MACHINE!= uname -m HOST_MACHINE!= uname -m
HOST_MACHINE_ARCH!= uname -p HOST_MACHINE_ARCH!= uname -p
BTOOLSDIR?= ${HOST_OBJTOP}/tools BTOOLSDIR?= ${HOST_OBJTOP}/tools
WORLDTMP= ${BTOOLSDIR}
LEGACY_TOOLS?= ${BTOOLSDIR}/legacy LEGACY_TOOLS?= ${BTOOLSDIR}/legacy
BSENV= \ BSENV= \
unset MAKEOBJDIR; MAKEOBJDIRPREFIX=${BTOOLSDIR} \
MAKESYSPATH=${SRCTOP}/tools/build/mk:${SRCTOP}/share/mk \ MAKESYSPATH=${SRCTOP}/tools/build/mk:${SRCTOP}/share/mk \
TARGET=${HOST_MACHINE} TARGET_ARCH=${HOST_MACHINE_ARCH} \ TARGET=${HOST_MACHINE} TARGET_ARCH=${HOST_MACHINE_ARCH} \
WITHOUT_STAGING=1 STAGE_ROOT= BOOTSTRAPPING_TOOLS=1 \ WITHOUT_STAGING=1 STAGE_ROOT= BOOTSTRAPPING_TOOLS=1 \
@ -34,6 +34,8 @@ OSRELDATE?= 0
# need to keep this in sync with src/Makefile.inc1 # need to keep this in sync with src/Makefile.inc1
BSARGS= DESTDIR= \ BSARGS= DESTDIR= \
OBJTOP='${WORLDTMP}/obj-$${BWPHASE}' \
OBJROOT='$${OBJTOP}/' \
BOOTSTRAPPING=${OSRELDATE} \ BOOTSTRAPPING=${OSRELDATE} \
BWPHASE=${.TARGET} \ BWPHASE=${.TARGET} \
SSP_CFLAGS= \ SSP_CFLAGS= \
@ -44,8 +46,6 @@ BSARGS= DESTDIR= \
MK_LLDB=no MK_TESTS=no \ MK_LLDB=no MK_TESTS=no \
MK_INCLUDES=yes MK_INCLUDES=yes
# Need to override these so OBJTOP uses are proper in the non-meta build.
BSARGS+= OBJTOP=${BTOOLSDIR}${SRCTOP} OBJROOT='$${OBJTOP}/'
# We will handle building the toolchain and cross-compiler. # We will handle building the toolchain and cross-compiler.
BSARGS+= MK_CROSS_COMPILER=no MK_CLANG=no MK_GCC=no BSARGS+= MK_CROSS_COMPILER=no MK_CLANG=no MK_GCC=no