From owner-svn-src-all@freebsd.org Mon Feb 24 16:41:17 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3DB2E23A681; Mon, 24 Feb 2020 16:41:17 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48R79n0DyZz4488; Mon, 24 Feb 2020 16:41:17 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F1729319; Mon, 24 Feb 2020 16:41:16 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 01OGfGrW032849; Mon, 24 Feb 2020 16:41:16 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 01OGfGKt032848; Mon, 24 Feb 2020 16:41:16 GMT (envelope-from imp@FreeBSD.org) Message-Id: <202002241641.01OGfGKt032848@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Mon, 24 Feb 2020 16:41:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r358291 - head/usr.sbin/config X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/usr.sbin/config X-SVN-Commit-Revision: 358291 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Feb 2020 16:41:17 -0000 Author: imp Date: Mon Feb 24 16:41:16 2020 New Revision: 358291 URL: https://svnweb.freebsd.org/changeset/base/358291 Log: Create ../compile Give up the battle to keep extra files in $MACHINE/compile to keep the file in the tree. Instead, create CDIR (usually ../compile) if it doesn't exist when we're using a default build location (eg, not using -d). If it does, we do nothing. This only affects people that do old-school builds, but it's bit me a dozen times since last summer so time to fix the bug. Modified: head/usr.sbin/config/main.c Modified: head/usr.sbin/config/main.c ============================================================================== --- head/usr.sbin/config/main.c Mon Feb 24 16:25:11 2020 (r358290) +++ head/usr.sbin/config/main.c Mon Feb 24 16:41:16 2020 (r358291) @@ -116,6 +116,7 @@ main(int argc, char **argv) char *kernfile; struct includepath* ipath; int printmachine; + bool cust_dest = false; printmachine = 0; kernfile = NULL; @@ -140,6 +141,7 @@ main(int argc, char **argv) strlcpy(destdir, optarg, sizeof(destdir)); else errx(EXIT_FAILURE, "directory already set"); + cust_dest = true; break; case 'g': debugging++; @@ -232,7 +234,14 @@ main(int argc, char **argv) exit(0); } - /* Make compile directory */ + /* + * Make CDIR directory, if doing a default destination. Some version + * control systems delete empty directories and this seemlessly copes. + */ + if (!cust_dest && stat(CDIR, &buf)) + if (mkdir(CDIR, 0777)) + err(2, "%s", CDIR); + /* Create the compile directory */ p = path((char *)NULL); if (stat(p, &buf)) { if (mkdir(p, 0777))