diff options
| author | will <will@FreeBSD.org> | 2014-09-18 01:57:36 +0000 |
|---|---|---|
| committer | will <will@FreeBSD.org> | 2014-09-18 01:57:36 +0000 |
| commit | ad4df7fd320711af1c0e3bf59b9c7274c0cf95ae (patch) | |
| tree | 0e2607ae6e3431db5f4a1ad77a5b7c6233f0818b /Makefile.inc1 | |
| parent | 8d0b59b51f2a443fc5017c788026b90bfa5e7df3 (diff) | |
| download | FreeBSD-src-ad4df7fd320711af1c0e3bf59b9c7274c0cf95ae.zip FreeBSD-src-ad4df7fd320711af1c0e3bf59b9c7274c0cf95ae.tar.gz | |
Root the lib32 object tree under the overall object tree.
This enables a common root directory for all object files for a given tree,
which eases sharing a common MAKEOBJDIRPREFIX, and cleaning up of object trees.
In particular, one can simply (from the source directory) rm -rf /usr/obj$(pwd)
to destroy all object files for it. Or to copy/sync files, etc.
Reviewed by: bdrewery
CR: https://reviews.freebsd.org/D796
MFC after: 1 month
Sponsored by: Spectra Logic
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 98362bd..b99b4d3 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -352,6 +352,7 @@ WMAKE= ${WMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 DESTDIR=${WORLDTMP} .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" # 32 bit world +LIB32_OBJTREE= ${OBJTREE}${.CURDIR}/world32 LIB32TMP= ${OBJTREE}${.CURDIR}/lib32 .if ${TARGET_ARCH} == "amd64" @@ -387,7 +388,7 @@ LIB32FLAGS+= --sysroot=${WORLDTMP} .endif # Yes, the flags are redundant. -LIB32WMAKEENV+= MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \ +LIB32WMAKEENV+= MAKEOBJDIRPREFIX=${LIB32_OBJTREE} \ _SHLIBDIRPREFIX=${LIB32TMP} \ _LDSCRIPTROOT=${LIB32TMP} \ VERSION="${VERSION}" \ @@ -611,7 +612,7 @@ build32: cd ${.CURDIR}/${_dir}; \ WORLDTMP=${WORLDTMP} \ MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" \ - MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} SSP_CFLAGS= DESTDIR= \ + MAKEOBJDIRPREFIX=${LIB32_OBJTREE} ${MAKE} SSP_CFLAGS= DESTDIR= \ DIRPRFX=${_dir}/ -DNO_LINT -DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \ build-tools .endfor |
