Module Name: src
Committed By: dholland
Date: Sun Jan 27 04:56:46 UTC 2019
Modified Files:
src/sys/arch/i386/stand: Makefile.inc
src/sys/arch/i386/stand/genprom: Makefile
src/sys/arch/i386/stand/misc: Makefile
Log Message:
fix duplicated chunk from merge
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/i386/stand/Makefile.inc
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/i386/stand/genprom/Makefile
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/i386/stand/misc/Makefile
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/i386/stand/Makefile.inc
diff -u src/sys/arch/i386/stand/Makefile.inc:1.17 src/sys/arch/i386/stand/Makefile.inc:1.18
--- src/sys/arch/i386/stand/Makefile.inc:1.17 Sun Jan 27 02:08:38 2019
+++ src/sys/arch/i386/stand/Makefile.inc Sun Jan 27 04:56:46 2019
@@ -1,9 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.17 2019/01/27 02:08:38 pgoyette Exp $
-
-NOLIBCSANITIZER=
-NOSANITIZER=
-NOPIE=
-NOMAN=
+# $NetBSD: Makefile.inc,v 1.18 2019/01/27 04:56:46 dholland Exp $
NOLIBCSANITIZER=
NOSANITIZER=
Index: src/sys/arch/i386/stand/genprom/Makefile
diff -u src/sys/arch/i386/stand/genprom/Makefile:1.9 src/sys/arch/i386/stand/genprom/Makefile:1.10
--- src/sys/arch/i386/stand/genprom/Makefile:1.9 Sun Jan 27 02:08:38 2019
+++ src/sys/arch/i386/stand/genprom/Makefile Sun Jan 27 04:56:46 2019
@@ -1,6 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2019/01/27 02:08:38 pgoyette Exp $
-
-.include <bsd.hostinit.mk>
+# $NetBSD: Makefile,v 1.10 2019/01/27 04:56:46 dholland Exp $
.include <bsd.hostinit.mk>
Index: src/sys/arch/i386/stand/misc/Makefile
diff -u src/sys/arch/i386/stand/misc/Makefile:1.10 src/sys/arch/i386/stand/misc/Makefile:1.11
--- src/sys/arch/i386/stand/misc/Makefile:1.10 Sun Jan 27 02:08:38 2019
+++ src/sys/arch/i386/stand/misc/Makefile Sun Jan 27 04:56:46 2019
@@ -1,6 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2019/01/27 02:08:38 pgoyette Exp $
-
-.include <bsd.hostinit.mk>
+# $NetBSD: Makefile,v 1.11 2019/01/27 04:56:46 dholland Exp $
.include <bsd.hostinit.mk>
