mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-15 21:05:08 +00:00
Set OBJROOT/OBJTOP as make arguments. Missed in r325329.
Sponsored by: Dell EMC Isilon
This commit is contained in:
parent
031d577716
commit
1031b94fc4
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=325411
|
@ -108,8 +108,6 @@ LIBCOMPATCXXFLAGS+= -isystem ${LIBCOMPATTMP}/usr/include/c++/v1 -std=c++11 \
|
||||||
|
|
||||||
# Yes, the flags are redundant.
|
# Yes, the flags are redundant.
|
||||||
LIBCOMPATWMAKEENV+= \
|
LIBCOMPATWMAKEENV+= \
|
||||||
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} \
|
||||||
|
@ -129,6 +127,8 @@ LIBCOMPATWMAKEFLAGS+= CC="${XCC} ${LIBCOMPATCFLAGS}" \
|
||||||
-DNO_LINT \
|
-DNO_LINT \
|
||||||
MK_TESTS=no
|
MK_TESTS=no
|
||||||
LIBCOMPATWMAKE+= ${LIBCOMPATWMAKEENV} ${MAKE} ${LIBCOMPATWMAKEFLAGS} \
|
LIBCOMPATWMAKE+= ${LIBCOMPATWMAKEENV} ${MAKE} ${LIBCOMPATWMAKEFLAGS} \
|
||||||
|
OBJTOP=${LIBCOMPAT_OBJTOP} \
|
||||||
|
OBJROOT='$${OBJTOP}/' \
|
||||||
MK_MAN=no MK_HTML=no
|
MK_MAN=no MK_HTML=no
|
||||||
LIBCOMPATIMAKE+= ${LIBCOMPATWMAKE:NINSTALL=*:NDESTDIR=*} \
|
LIBCOMPATIMAKE+= ${LIBCOMPATWMAKE:NINSTALL=*:NDESTDIR=*} \
|
||||||
MK_TOOLCHAIN=no ${IMAKE_INSTALL} \
|
MK_TOOLCHAIN=no ${IMAKE_INSTALL} \
|
||||||
|
@ -185,9 +185,9 @@ 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}" \
|
||||||
|
${MAKE} SSP_CFLAGS= DESTDIR= \
|
||||||
OBJTOP=${LIBCOMPAT_OBJTOP} \
|
OBJTOP=${LIBCOMPAT_OBJTOP} \
|
||||||
OBJROOT='$${OBJTOP}/' \
|
OBJROOT='$${OBJTOP}/' \
|
||||||
${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
|
||||||
.endfor
|
.endfor
|
||||||
|
|
Loading…
Reference in a new issue