diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2017-11-05 00:11:47 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2017-11-05 00:11:47 +0000 |
| commit | 1031b94fc4e0310b49781e0936de6486b5f836b8 (patch) | |
| tree | 0e46d4f9d7d3827b9047c83c4c7013e13c44144a /Makefile.libcompat | |
| parent | 031d57771613a2594c6fb027e25a5710a4e9f7e5 (diff) | |
| download | src-test2-1031b94fc4e0310b49781e0936de6486b5f836b8.tar.gz src-test2-1031b94fc4e0310b49781e0936de6486b5f836b8.zip | |
Set OBJROOT/OBJTOP as make arguments. Missed in r325329.
Sponsored by: Dell EMC Isilon
Notes
Notes:
svn path=/head/; revision=325411
Diffstat (limited to 'Makefile.libcompat')
| -rw-r--r-- | Makefile.libcompat | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.libcompat b/Makefile.libcompat index 5bb455d0178f..9d64fb7e326c 100644 --- a/Makefile.libcompat +++ b/Makefile.libcompat @@ -108,8 +108,6 @@ LIBCOMPATCXXFLAGS+= -isystem ${LIBCOMPATTMP}/usr/include/c++/v1 -std=c++11 \ # Yes, the flags are redundant. LIBCOMPATWMAKEENV+= \ - OBJTOP=${LIBCOMPAT_OBJTOP} \ - OBJROOT='$${OBJTOP}/' \ INSTALL="sh ${.CURDIR}/tools/install.sh" \ PATH=${TMPPATH} \ SYSROOT=${LIBCOMPATTMP} \ @@ -129,6 +127,8 @@ LIBCOMPATWMAKEFLAGS+= CC="${XCC} ${LIBCOMPATCFLAGS}" \ -DNO_LINT \ MK_TESTS=no LIBCOMPATWMAKE+= ${LIBCOMPATWMAKEENV} ${MAKE} ${LIBCOMPATWMAKEFLAGS} \ + OBJTOP=${LIBCOMPAT_OBJTOP} \ + OBJROOT='$${OBJTOP}/' \ MK_MAN=no MK_HTML=no LIBCOMPATIMAKE+= ${LIBCOMPATWMAKE:NINSTALL=*:NDESTDIR=*} \ MK_TOOLCHAIN=no ${IMAKE_INSTALL} \ @@ -185,9 +185,9 @@ build${libcompat}: .PHONY ${_+_}cd ${.CURDIR}/${_dir}; \ WORLDTMP=${WORLDTMP} \ MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" \ + ${MAKE} SSP_CFLAGS= DESTDIR= \ OBJTOP=${LIBCOMPAT_OBJTOP} \ OBJROOT='$${OBJTOP}/' \ - ${MAKE} SSP_CFLAGS= DESTDIR= \ DIRPRFX=${_dir}/ -DNO_LINT -DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \ build-tools .endfor |