[src/trunk]: src/distrib/sets Force ARCHDIR_SUBDIR to empty before including ...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/98a69f5b9aab
branches:  trunk
changeset: 339016:98a69f5b9aab
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Jun 22 08:51:42 2015 +0000

description:
Force ARCHDIR_SUBDIR to empty before including some archdirs.mk - the
different files may set different values (or none at all).
Example: earm has "oabi" as compat, but none as module subdir.

diffstat:

 distrib/sets/mkvars.mk |  4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diffs (23 lines):

diff -r e56973b9d6ed -r 98a69f5b9aab distrib/sets/mkvars.mk
--- a/distrib/sets/mkvars.mk    Mon Jun 22 07:26:52 2015 +0000
+++ b/distrib/sets/mkvars.mk    Mon Jun 22 08:51:42 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mkvars.mk,v 1.19 2015/06/22 05:59:59 matt Exp $
+# $NetBSD: mkvars.mk,v 1.20 2015/06/22 08:51:42 martin Exp $
 
 MKEXTRAVARS= \
        MACHINE \
@@ -48,11 +48,13 @@
 .endif
 
 .if ${MKCOMPAT} != "no"
+ARCHDIR_SUBDIR:=
 .include "${NETBSDSRCDIR}/compat/archdirs.mk"
 COMPATARCHDIRS:=${ARCHDIR_SUBDIR:T}
 .endif
 
 .if ${MKKMOD} != "no"
+ARCHDIR_SUBDIR:=
 .include "${NETBSDSRCDIR}/sys/modules/arch/archdirs.mk"
 KMODARCHDIRS:=${ARCHDIR_SUBDIR:T}
 .endif