Module Name: src
Committed By: martin
Date: Thu Mar 10 09:00:24 UTC 2016
Modified Files:
src/sys/arch/sparc/stand: Makefile.buildboot Makefile.inc
Log Message:
Add a few includes of bsd.own.mk to avoid broken test conditions
on ACTIVE_CC - this might not be the correct fix for PR 50930,
but it avoids the issue.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/sparc/stand/Makefile.buildboot
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/sparc/stand/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc/stand/Makefile.buildboot
diff -u src/sys/arch/sparc/stand/Makefile.buildboot:1.30 src/sys/arch/sparc/stand/Makefile.buildboot:1.31
--- src/sys/arch/sparc/stand/Makefile.buildboot:1.30 Sat Feb 27 19:25:08 2016
+++ src/sys/arch/sparc/stand/Makefile.buildboot Thu Mar 10 09:00:24 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.buildboot,v 1.30 2016/02/27 19:25:08 joerg Exp $
+# $NetBSD: Makefile.buildboot,v 1.31 2016/03/10 09:00:24 martin Exp $
#
# This file is for the sparc `boot' and `bootxx' only; it does not
# currently play well on a 64-bit system.
@@ -13,6 +13,8 @@ SRCS= ${COMMONSOURCE} ${PROGSOURCE}
NOMAN= # defined
BINMODE= 444
+.include <bsd.own.mk>
+
#
# The relocation address for `boot' must leave enough free memory below
# it to load a kernel at address 0x4000. On the other hand, on some
Index: src/sys/arch/sparc/stand/Makefile.inc
diff -u src/sys/arch/sparc/stand/Makefile.inc:1.11 src/sys/arch/sparc/stand/Makefile.inc:1.12
--- src/sys/arch/sparc/stand/Makefile.inc:1.11 Sat Feb 27 19:26:14 2016
+++ src/sys/arch/sparc/stand/Makefile.inc Thu Mar 10 09:00:24 2016
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile.inc,v 1.11 2016/02/27 19:26:14 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.12 2016/03/10 09:00:24 martin Exp $
.ifndef __INCLUDED_STAND_MAKEFILE_INC
__INCLUDED_STAND_MAKEFILE_INC=
+.include <bsd.own.mk>
+
BINDIR= /usr/mdec
CPPFLAGS+= -DSTANDALONE -I.
