Module Name:    src
Committed By:   matt
Date:           Thu Aug 27 22:48:36 UTC 2009

Modified Files:
        src/bin [matt-nb5-mips64]: Makefile.inc
        src/sbin [matt-nb5-mips64]: Makefile.inc

Log Message:
Change LDSTATIC?= -static to LDSTATIC+= -static so MKDYNAMICROOT=no works again.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.15.32.1 src/bin/Makefile.inc
cvs rdiff -u -r1.20 -r1.20.32.1 src/sbin/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/bin/Makefile.inc
diff -u src/bin/Makefile.inc:1.15 src/bin/Makefile.inc:1.15.32.1
--- src/bin/Makefile.inc:1.15	Sun Jun 26 19:10:48 2005
+++ src/bin/Makefile.inc	Thu Aug 27 22:48:36 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.15 2005/06/26 19:10:48 christos Exp $
+#	$NetBSD: Makefile.inc,v 1.15.32.1 2009/08/27 22:48:36 matt Exp $
 #	@(#)Makefile.inc	8.1 (Berkeley) 5/31/93
 
 .include <bsd.own.mk>		# for MKDYNAMICROOT definition
@@ -7,5 +7,5 @@
 BINDIR?=	/bin
 
 .if (${MKDYNAMICROOT} == "no")
-LDSTATIC?=	-static
+LDSTATIC+=	-static
 .endif

Index: src/sbin/Makefile.inc
diff -u src/sbin/Makefile.inc:1.20 src/sbin/Makefile.inc:1.20.32.1
--- src/sbin/Makefile.inc:1.20	Sun Oct  8 17:52:28 2006
+++ src/sbin/Makefile.inc	Thu Aug 27 22:48:36 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.20 2006/10/08 17:52:28 peter Exp $
+#	$NetBSD: Makefile.inc,v 1.20.32.1 2009/08/27 22:48:36 matt Exp $
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/8/93
 
 .include <bsd.own.mk>		# for MKDYNAMICROOT definition
@@ -7,5 +7,5 @@
 BINDIR?=	/sbin
 
 .if (${MKDYNAMICROOT} == "no")
-LDSTATIC?=	-static
+LDSTATIC+=	-static
 .endif

Reply via email to