From bcbb770d533a3354e4d7fa18c384a5b3bfed3fe6 Mon Sep 17 00:00:00 2001 From: bsiegert Date: Sun, 22 Oct 2017 19:29:20 +0000 Subject: Set cwrappers in bootstrap mk.conf too. When bootstrap is run with --cwrappers=no (or yes, for that matter), the value is written into mk.conf at the end of the bootstrap but not used _during_ the bootstrap itself. Thus, when bootstrapping on Linux with no builtin diffutils, cwrappers ends up indirectly depending on itself, and there is no way around that. This commit fixes this. --- bootstrap/bootstrap | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'bootstrap') diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap index 9fea58ea27a..79c17daf8cc 100755 --- a/bootstrap/bootstrap +++ b/bootstrap/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh -# $NetBSD: bootstrap,v 1.243 2017/09/23 05:43:51 maya Exp $ +# $NetBSD: bootstrap,v 1.244 2017/10/22 19:29:20 bsiegert Exp $ # # Copyright (c) 2001-2011 Alistair Crooks # All rights reserved. @@ -1090,6 +1090,7 @@ cp ${TARGET_MKCONF} ${BOOTSTRAP_MKCONF} case "$cwrappers" in yes|no) echo "USE_CWRAPPERS= $cwrappers" >> ${TARGET_MKCONF} + echo "USE_CWRAPPERS= $cwrappers" >> ${BOOTSTRAP_MKCONF} echo "" >> ${TARGET_MKCONF} ;; esac -- cgit v1.2.3