From nobody Tue Apr 18 05:31:03 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q0sw74ysGz45lhH; Tue, 18 Apr 2023 05:31:03 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q0sw74Nrsz4GG2; Tue, 18 Apr 2023 05:31:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681795863; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KUE4+KffOy7Tuine/Whu2EipBAkwN8UyyUHvEnljB7I=; b=QeJGGC2Ikj9BwlGmPHB5sYlDnfZ6bZ5LAZttjvMSxEGcd09cfIy84NO4msqH4KiSi9y4SR ip1ylucl3CIQT72Tm++rXRqDaT2/qj6B+NFMP0RgyBnJvQ5BUx+WRjIswK9dSzzylvOB4Y jUtV/q6NQVu01rfv+E9eex0wP4fXL2ytB8+uKX3Z7ylCIhWA8AyjvadxGTSZvSMDmM58AN zwnmETtFJkjEInT6nXJ+pvej+hx2mlayRFDwi+k1w52PUDKtiHbOXFUGxXQ09H7oHCBs+h gJmHF9eMGGbR55oHrgV2+bPhg2JvqmTU1j3ZhTCSNJqz7u/rbUMEysJJuT05pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681795863; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KUE4+KffOy7Tuine/Whu2EipBAkwN8UyyUHvEnljB7I=; b=pgm1YavXQlHuUQE9Gle4O9dodqgXcgRuSzMUsDUo0JNER3Gq3ltszMvxVWRvJeZaA7LSXU 6z9JJGDayZRhMJF4cFWP7NVkiSBjGBuzk4Ys+JfyUDllb8dEoEfAUdTRFlI+Mkxc7V8ajv UMvxR39/Vi3+N7aqz7IWuRkGFl0aThHoyy1PGDS84wrChehIJqPUsnDBLvhb0b9O9+A2q4 fzMrBBF1nhioU9sjD1A5fjuD8QFgrNAMDHDRGBZe+BhFn6ncyVSak7oGW2h7V2qzfHw25i 84svXo3shcFnjf+Fz6474BAtH0FNMGJkeA6FgLkjqsn9Q+Cc2IX/l37vP/0tvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681795863; a=rsa-sha256; cv=none; b=mQtusDuqPnMrV+Ul2CO7hxHGCzuDmAeXC5uM+q9T+OJ9tkYDYcDoaZZyiMWNf9XfLQRSA5 VFkbHapduy5CSfxnHS02fM8AQtBHVwTD5D7pkuM3+IV2yMSgptg1GCFwsufSDLmz1LXKQ3 gIWqv/JTJKTmieH/Y3B+Ot2cN7YGO7ELbqwe6WO55zicgr81QJ6/BnY4kijGK5MDI4ufSM suNTgpyDVX0Yjdpzd5dqLLfvvo36naAAjYxn3KTNaCi7+lOUZn5fqnNBhKGKksS9PaXuE/ 8Be2zDQ4eWMaAv7MCey7JTFC6v9182MWyaI7bPa/CaogfY5YYmBUuPjOPys8pQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q0sw73Tx1zypR; Tue, 18 Apr 2023 05:31:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33I5V3dK031747; Tue, 18 Apr 2023 05:31:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33I5V3ZF031746; Tue, 18 Apr 2023 05:31:03 GMT (envelope-from git) Date: Tue, 18 Apr 2023 05:31:03 GMT Message-Id: <202304180531.33I5V3ZF031746@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Stephen J. Kiernan" Subject: git: 49b6bc83cc4e - main - meta: print some additional variables on build errors. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: stevek X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 49b6bc83cc4e735da75abe104d4deb0ed52c4958 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by stevek: URL: https://cgit.FreeBSD.org/src/commit/?id=49b6bc83cc4e735da75abe104d4deb0ed52c4958 commit 49b6bc83cc4e735da75abe104d4deb0ed52c4958 Author: Stephen J. Kiernan AuthorDate: 2023-04-18 04:32:06 +0000 Commit: Stephen J. Kiernan CommitDate: 2023-04-18 05:30:34 +0000 meta: print some additional variables on build errors. Add CPUTYPE and MACHINE_CPUARCH to the list of variables printed when there are build errors. Protect local.sys.mk from multiple inclusion. Reviewed by: sjg Obtained from: Juniper Networks, Inc. --- share/mk/local.sys.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/share/mk/local.sys.mk b/share/mk/local.sys.mk index 519c72df2383..39605c05e129 100644 --- a/share/mk/local.sys.mk +++ b/share/mk/local.sys.mk @@ -1,5 +1,8 @@ # $FreeBSD$ +.if !target(_${_this}_) +_${_this}_: .NOTMAIN + .if ${MK_DIRDEPS_BUILD} == "yes" || ${MK_META_MODE} == "yes" # Not in the below list as it may make sense for non-meta mode @@ -21,10 +24,12 @@ MAKE_PRINT_VAR_ON_ERROR+= \ .MAKE \ .OBJDIR \ .TARGETS \ + CPUTYPE \ DESTDIR \ LD_LIBRARY_PATH \ MACHINE \ MACHINE_ARCH \ + MACHINE_CPUARCH \ MAKEOBJDIRPREFIX \ MAKESYSPATH \ MAKE_VERSION \ @@ -87,3 +92,5 @@ META_NOPHONY?= META_COOKIE_RM?= META_COOKIE_TOUCH?= META_DEPS+= ${META_NOPHONY} + +.endif