From nobody Mon Dec 09 21:48:56 2024 X-Original-To: dev-commits-src-branches@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 4Y6b945JqFz5gqQ1; Mon, 09 Dec 2024 21:48:56 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y6b94404Nz4HKj; Mon, 9 Dec 2024 21:48:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733780936; 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=d0LSBNyf5ughbVSlQBPSHYp0rakjVnbR+nr99wrHUI8=; b=OiAJ8JGE9wrWUmtJliYuVlRhq4wshEliZBJnqfneaHaS39snJkK0isTlQ3N413Ge+SMlIu /P1XDJaG1q7CWiWnmYQyIoOyfR9nRoX5uP8Wd2B+l/ykjZJ9EpzLvXYMoVrDHHbyl7XlEw uuLzS4fcV9BImKJEyvgWIMZRkeAChv0y5QVowwpcexATTFRA7qmOKQnDFgGB2Vcjm30xw5 SDkZ9EQp8sq8G6HRKBcEMXs/CJbyrvJXFM3kMtZHXaNt2qvxkWulc1CNW+Bw99sJPrHq5z RI5dxqm6daUXgh6JXFBfhGoh1A77K7u0rbqUgy+m++ABt4rSSVJLY2INXS3nLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733780936; 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=d0LSBNyf5ughbVSlQBPSHYp0rakjVnbR+nr99wrHUI8=; b=tfWsq1hbuAritOiGWJjQMZ71+zUBseX3xHomJSnUI3oDpm+MEXveZExV9r6yxEtssWZDN+ ScwFaSHx7N1xY83yb8meE6miXP7N2SWO8de5DqsixAsEPcJMDK9tyLGLMpczI5Fuwj2ezM mX/oKiaZekHvwbZ22MLTKYgMhyoF84IPc2A2SZDssWzc9aUeMP1Jeux9fu1EVlMnw1uxUh gfj3ht6x39PGJy1zXIRkG8egDFZeqjtEt4ZQUe3KxcrlnxHak7nNrkg/45ZbZv73ZDj7tn UiD6K/oqlctoy1XM7Uhojd7300BYvN2xEBkfV/awEu6FGLKGuFHoniUm78OUbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733780936; a=rsa-sha256; cv=none; b=G50mKZtbNBeEd99U8UJdR3nDRfoir/pViIDUsIseQ6Db2KFnmtMXapl5S0GNQHd99QRdEo w7FeQg2rNGBPzsibFcLv4t3oTwxCh9cpagIRmGB/Q91vQey9r2RvZzOdNE5tOF/e1gDiHR ROEMEGKhlYIXPqp996t/epE+YamZQxVq4rUSC0bUz2ZN3laJe7wClTHU5P79dM+2NAGevy m3S0OQR9W0hyusxZV24Hatasv1BjzSrqpwqDdEsqXbPzO+EpQOwXmEsszECB5C3e+TiEeN 9aMqQcFhgEmVCOYnXjA2fI2D09hw7zhU9nL4m1OdvqxTHmW/DvhTfEELt1e/jw== 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 4Y6b943bmvzvVJ; Mon, 9 Dec 2024 21:48:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B9LmumA033113; Mon, 9 Dec 2024 21:48:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B9Lmuoj033110; Mon, 9 Dec 2024 21:48:56 GMT (envelope-from git) Date: Mon, 9 Dec 2024 21:48:56 GMT Message-Id: <202412092148.4B9Lmuoj033110@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: 37d2e25a2dc7 - stable/13 - Make sure MACHINE(_ARCH) are exported for depend-cleanup.sh List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 37d2e25a2dc7c9a12148b71dc6cf4a0c4bffdcd2 Auto-Submitted: auto-generated The branch stable/13 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=37d2e25a2dc7c9a12148b71dc6cf4a0c4bffdcd2 commit 37d2e25a2dc7c9a12148b71dc6cf4a0c4bffdcd2 Author: Jessica Clarke AuthorDate: 2023-07-11 00:53:04 +0000 Commit: Brooks Davis CommitDate: 2024-12-09 21:46:43 +0000 Make sure MACHINE(_ARCH) are exported for depend-cleanup.sh We run depend-cleanup.sh twice during the build. The second time is the normal run, where we run it under WMAKEENV and thus have CROSSENV's MACHINE(_ARCH)=${TARGET(_ARCH)} in the environment. However, the first time is for bootstrap-tools, where it's run under BMAKEENV and we don't have any assignments to MACHINE(_ARCH) in the environment, meaning the script sees them as unset. In practice this doesn't matter since the only use doesn't apply to bootstrap-tools, but it could be a future issue. Thus, explicitly export them for depend-cleanup.sh and have the script verify they're set. Differential Revision: https://reviews.freebsd.org/D40968 (cherry picked from commit c70dd03a7ff649f832f1d29179b9094720392bce) Pull Request: https://github.com/freebsd/freebsd-src/pull/1543 --- Makefile.inc1 | 3 ++- tools/build/depend-cleanup.sh | 10 ++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 48cd0f1c772c..c8b5fc856dd5 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1029,7 +1029,8 @@ _sanity_check: .PHONY .MAKE # replacing generated files. Handle these cases here in an ad-hoc fashion. _cleanobj_fast_depend_hack: .PHONY @echo ">>> Deleting stale dependencies..."; - sh ${.CURDIR}/tools/build/depend-cleanup.sh ${OBJTOP} + MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE_ARCH} \ + sh ${.CURDIR}/tools/build/depend-cleanup.sh ${OBJTOP} _worldtmp: .PHONY @echo diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index fd29c50593a5..385df785b426 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -22,6 +22,16 @@ if [ ! -d "$OBJTOP" ]; then exit 1 fi +if [ -z "${MACHINE+set}" ]; then + echo "$(basename "$0"): MACHINE not set" >&2 + exit 1 +fi + +if [ -z "${MACHINE_ARCH+set}" ]; then + echo "$(basename "$0"): MACHINE_ARCH not set" >&2 + exit 1 +fi + # $1 directory # $2 source filename w/o extension # $3 source extension