Source-Changes-HG archive

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

[src/trunk]: src/usr.bin/make make(1): revert requiring a writable objdir



details:   https://anonhg.NetBSD.org/src/rev/3a1c41b0e841
branches:  trunk
changeset: 945513:3a1c41b0e841
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sat Oct 31 16:13:00 2020 +0000

description:
make(1): revert requiring a writable objdir

The change in main.c 1.413 broke the NetBSD build.sh if it uses a
read-only source tree, as in the daily builds.

Original commit:
https://mail-index.netbsd.org/source-changes/2020/10/31/msg123560.html

Build log:
make warning: /home/source/ab/HEAD/src: Permission denied.
[1]   Segmentation fault      "${make}" -m ${T...

diffstat:

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

diffs (27 lines):

diff -r 7d01b59da726 -r 3a1c41b0e841 usr.bin/make/main.c
--- a/usr.bin/make/main.c       Sat Oct 31 16:03:01 2020 +0000
+++ b/usr.bin/make/main.c       Sat Oct 31 16:13:00 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.418 2020/10/31 11:34:30 rillig Exp $        */
+/*     $NetBSD: main.c,v 1.419 2020/10/31 16:13:00 rillig Exp $        */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -118,7 +118,7 @@
 #include "trace.h"
 
 /*     "@(#)main.c     8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: main.c,v 1.418 2020/10/31 11:34:30 rillig Exp $");
+MAKE_RCSID("$NetBSD: main.c,v 1.419 2020/10/31 16:13:00 rillig Exp $");
 #if defined(MAKE_NATIVE) && !defined(lint)
 __COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 "
            "The Regents of the University of California.  "
@@ -721,7 +721,7 @@
 
        /* look for the directory and try to chdir there */
        if (stat(path, &sb) == 0 && S_ISDIR(sb.st_mode)) {
-               if (access(path, W_OK) || chdir(path)) {
+               if (chdir(path)) {
                        (void)fprintf(stderr, "make warning: %s: %s.\n",
                                      path, strerror(errno));
                } else {



Home | Main Index | Thread Index | Old Index