diff options
| author | riastradh <riastradh@pkgsrc.org> | 2022-04-04 11:23:18 +0000 |
|---|---|---|
| committer | riastradh <riastradh@pkgsrc.org> | 2022-04-04 11:23:18 +0000 |
| commit | aa930ef0996105dbba2b3ddb57d6f1388743b076 (patch) | |
| tree | 45c520ebb2e537c730387e4cba27c58576e75657 /mk/bsd.prefs.mk | |
| parent | 73c4eb1d0670b65afa7e80a35ffb56b7173c700b (diff) | |
| download | pkgsrc-aa930ef0996105dbba2b3ddb57d6f1388743b076.tar.gz | |
mk: For cross-builds, use work.$ARCH and packages.$ARCH by default.
Otherwise it is mandatory to set these in mk.conf anyway, so let's
save the trouble.
Diffstat (limited to 'mk/bsd.prefs.mk')
| -rw-r--r-- | mk/bsd.prefs.mk | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index b2973a8898c..406338a0d87 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.417 2022/04/04 11:23:06 riastradh Exp $ +# $NetBSD: bsd.prefs.mk,v 1.418 2022/04/04 11:23:18 riastradh Exp $ # # This file includes the mk.conf file, which contains the user settings. # @@ -717,8 +717,12 @@ MAKEFLAGS+= _PKGSRCDIR=${_PKGSRCDIR:Q} .endif PKGSRCDIR= ${_PKGSRCDIR} +.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) +_CROSSDIR_SUFFIX= .${MACHINE_ARCH} +.endif + DISTDIR?= ${PKGSRCDIR}/distfiles -PACKAGES?= ${PKGSRCDIR}/packages +PACKAGES?= ${PKGSRCDIR}/packages${_CROSSDIR_SUFFIX} TEMPLATES?= ${PKGSRCDIR}/templates PATCHDIR?= ${.CURDIR}/patches @@ -743,13 +747,13 @@ BUILD_DIR!= cd ${.CURDIR} && ${PWD_CMD} _HOSTNAME!= ${UNAME} -n MAKEFLAGS+= _HOSTNAME=${_HOSTNAME:Q} . endif -WRKDIR_BASENAME?= work.${_HOSTNAME:C|\..*||} +WRKDIR_BASENAME?= work${_CROSSDIR_SUFFIX}.${_HOSTNAME:C|\..*||} MAKEFLAGS+= OBJHOSTNAME=${OBJHOSTNAME:Q} .elif defined(OBJMACHINE) WRKDIR_BASENAME?= work.${MACHINE_ARCH} MAKEFLAGS+= OBJMACHINE=${OBJMACHINE:Q} .else -WRKDIR_BASENAME?= work +WRKDIR_BASENAME?= work${_CROSSDIR_SUFFIX} .endif WRKDIR?= ${BUILD_DIR}/${WRKDIR_BASENAME} |