From f8eaf47ccc40a94d538661bc226abbc0318ee69c Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 17 Nov 2004 17:18:33 +0000 Subject: For some reason EVAL_PREFIX is not properly using the _DEFAULT values, so re-add the ?= assignments. (Will be fixed properly later.) --- mk/compiler/ccache.mk | 3 ++- mk/compiler/distcc.mk | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'mk/compiler') diff --git a/mk/compiler/ccache.mk b/mk/compiler/ccache.mk index 6dff2912a8a..1fac6383bef 100644 --- a/mk/compiler/ccache.mk +++ b/mk/compiler/ccache.mk @@ -1,4 +1,4 @@ -# $NetBSD: ccache.mk,v 1.19 2004/11/17 17:14:43 tv Exp $ +# $NetBSD: ccache.mk,v 1.20 2004/11/17 17:18:33 tv Exp $ .if !defined(COMPILER_CCACHE_MK) COMPILER_CCACHE_MK= defined @@ -34,6 +34,7 @@ _USE_CCACHE= YES .if !empty(_USE_CCACHE:M[yY][eE][sS]) EVAL_PREFIX+= _CCACHEBASE=ccache _CCACHEBASE_DEFAULT= ${LOCALBASE} +_CCACHEBASE?= ${LOCALBASE} _CCACHE_DIR= ${WRKDIR}/.ccache _CCACHE_LINKS= # empty diff --git a/mk/compiler/distcc.mk b/mk/compiler/distcc.mk index 82119715aa3..00e7c34e71a 100644 --- a/mk/compiler/distcc.mk +++ b/mk/compiler/distcc.mk @@ -1,4 +1,4 @@ -# $NetBSD: distcc.mk,v 1.20 2004/11/17 17:14:43 tv Exp $ +# $NetBSD: distcc.mk,v 1.21 2004/11/17 17:18:33 tv Exp $ .if !defined(COMPILER_DISTCC_MK) COMPILER_DISTCC_MK= defined @@ -34,6 +34,7 @@ _USE_DISTCC= YES .if !empty(_USE_DISTCC:M[yY][eE][sS]) EVAL_PREFIX+= _DISTCCBASE=distcc _DISTCCBASE_DEFAULT= ${LOCALBASE} +_DISTCCBASE?= ${LOCALBASE} _DISTCC_DIR= ${WRKDIR}/.distcc _DISTCC_LINKS= # empty -- cgit v1.2.3