Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-2-0]: src/usr.bin/make Pull up revision 1.102 (requested by sjg i...



details:   https://anonhg.NetBSD.org/src/rev/90e002bceed7
branches:  netbsd-2-0
changeset: 560855:90e002bceed7
user:      tron <tron%NetBSD.org@localhost>
date:      Mon May 10 15:42:07 2004 +0000

description:
Pull up revision 1.102 (requested by sjg in ticket #282):
Simplify build, no functional changes.
Instead of adding MAKE_BOOTSTRAP for hosted environments, i.e., when
you want things simple, instead add MAKE_NATIVE to get those hugely
important features like __RCSID().
It's now possible to build make on some hosts with: cc *.c */*.c

diffstat:

 usr.bin/make/main.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (47 lines):

diff -r 4f86066cb15d -r 90e002bceed7 usr.bin/make/main.c
--- a/usr.bin/make/main.c       Mon May 10 15:41:59 2004 +0000
+++ b/usr.bin/make/main.c       Mon May 10 15:42:07 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.100.2.1 2004/05/10 15:32:44 tron Exp $      */
+/*     $NetBSD: main.c,v 1.100.2.2 2004/05/10 15:42:07 tron Exp $      */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -68,8 +68,8 @@
  * SUCH DAMAGE.
  */
 
-#ifdef MAKE_BOOTSTRAP
-static char rcsid[] = "$NetBSD: main.c,v 1.100.2.1 2004/05/10 15:32:44 tron Exp $";
+#ifndef MAKE_NATIVE
+static char rcsid[] = "$NetBSD: main.c,v 1.100.2.2 2004/05/10 15:42:07 tron Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
@@ -81,7 +81,7 @@
 #if 0
 static char sccsid[] = "@(#)main.c     8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: main.c,v 1.100.2.1 2004/05/10 15:32:44 tron Exp $");
+__RCSID("$NetBSD: main.c,v 1.100.2.2 2004/05/10 15:42:07 tron Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -119,7 +119,7 @@
 #include <sys/resource.h>
 #include <sys/signal.h>
 #include <sys/stat.h>
-#ifndef MAKE_BOOTSTRAP
+#ifdef MAKE_NATIVE
 #include <sys/utsname.h>
 #endif
 #include <sys/wait.h>
@@ -690,7 +690,7 @@
         * run-time.
         */
        if (!machine) {
-#ifndef MAKE_BOOTSTRAP
+#ifdef MAKE_NATIVE
            struct utsname utsname;
 
            if (uname(&utsname) == -1) {



Home | Main Index | Thread Index | Old Index