Module Name: src
Committed By: martin
Date: Mon Jun 22 08:51:42 UTC 2015
Modified Files:
src/distrib/sets: mkvars.mk
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/distrib/sets/mkvars.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/mkvars.mk
diff -u src/distrib/sets/mkvars.mk:1.19 src/distrib/sets/mkvars.mk:1.20
--- src/distrib/sets/mkvars.mk:1.19 Mon Jun 22 05:59:59 2015
+++ src/distrib/sets/mkvars.mk Mon Jun 22 08:51:42 2015
@@ -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 @@ MKMANPAGES=yes
.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
