diff options
| author | ru <ru@FreeBSD.org> | 2005-03-02 16:40:51 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2005-03-02 16:40:51 +0000 |
| commit | 86bbb8bc22a9af0538899fb9669285b5aa150702 (patch) | |
| tree | c716f8e4b6261d09bb9c4bf7f3a554df0e91d7ea /Makefile.inc1 | |
| parent | cee9e98f0ee1c954b22e9d755db15444797bf2ee (diff) | |
| download | FreeBSD-src-86bbb8bc22a9af0538899fb9669285b5aa150702.zip FreeBSD-src-86bbb8bc22a9af0538899fb9669285b5aa150702.tar.gz | |
Add hacks that I use to test cross-builds (by building on
native and foreign architectures and comparing products).
They eliminate most of the differences caused by different
object directory paths, timestamping, and identification.
(Note WORLDTMP was renamed to ${OBJTREE}${.CURDIR}/tmp.)
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 1eb8835..77985fc 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -127,12 +127,12 @@ BUILD_ARCH!= sysctl -n hw.machine_arch .error To cross-build, set TARGET_ARCH. .endif .endif -.if ${MACHINE} == ${TARGET} +.if ${MACHINE} == ${TARGET} && !defined(CROSS_BUILD_TESTING) OBJTREE= ${MAKEOBJDIRPREFIX} .else OBJTREE= ${MAKEOBJDIRPREFIX}/${TARGET} .endif -WORLDTMP= ${OBJTREE}${.CURDIR}/${MACHINE_ARCH} +WORLDTMP= ${OBJTREE}${.CURDIR}/tmp # /usr/games added for fortune which depend on strfile BPATH= ${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/usr/games XPATH= ${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin:${WORLDTMP}/usr/games |
