summaryrefslogtreecommitdiff
path: root/usr.bin/make/compat.c
diff options
context:
space:
mode:
authorrillig <rillig@NetBSD.org>2020-12-27 05:16:26 +0000
committerrillig <rillig@NetBSD.org>2020-12-27 05:16:26 +0000
commit9940dd6fa1142e51f04df7b4cd6b2aa467e31600 (patch)
tree424170476fc94b729d217f6fcc5ffe4fb188daa2 /usr.bin/make/compat.c
parent57b23abc0f734d85857dd3435b0ecadb47f04bf6 (diff)
make(1): re-export variables from the actual make process
Since make uses vfork if available, re-exporting the variables happens in the address space of the main process anyway, so there is no point in mentioning anything about "our client process" anywhere.
Diffstat (limited to 'usr.bin/make/compat.c')
-rw-r--r--usr.bin/make/compat.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.bin/make/compat.c b/usr.bin/make/compat.c
index 161f31220ba..6a3d21cf52a 100644
--- a/usr.bin/make/compat.c
+++ b/usr.bin/make/compat.c
@@ -1,4 +1,4 @@
-/* $NetBSD: compat.c,v 1.216 2020/12/20 21:07:32 rillig Exp $ */
+/* $NetBSD: compat.c,v 1.217 2020/12/27 05:16:26 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -96,7 +96,7 @@
#include "pathnames.h"
/* "@(#)compat.c 8.2 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: compat.c,v 1.216 2020/12/20 21:07:32 rillig Exp $");
+MAKE_RCSID("$NetBSD: compat.c,v 1.217 2020/12/27 05:16:26 rillig Exp $");
static GNode *curTarg = NULL;
static pid_t compatChild;
@@ -350,6 +350,8 @@ Compat_RunCommand(const char *cmdp, GNode *gn, StringListNode *ln)
}
#endif
+ Var_ReexportVars();
+
/*
* Fork and execute the single command. If the fork fails, we abort.
*/
@@ -358,7 +360,6 @@ Compat_RunCommand(const char *cmdp, GNode *gn, StringListNode *ln)
Fatal("Could not fork");
}
if (cpid == 0) {
- Var_ReexportVars();
#ifdef USE_META
if (useMeta) {
meta_compat_child();