From nobody Thu Mar 20 17:59:41 2025 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 4ZJYHz3hpqz5r9nR; Thu, 20 Mar 2025 17:59:43 +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 4ZJYHy2f0xz4LTD; Thu, 20 Mar 2025 17:59:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742493582; 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=lpmZTRJwucFIA0+s6sOP64vOmrZ3leZB4BlYksziE80=; b=Ik5WcEqr2dNC05UB/DSpi/zvHvYO4ZkkPlkgEmK0uYUTn5seQYuHHSgh7WCJX8nvTALbff gyhe+XIfzwKWO33JldZwDj5XiWXZk9hmJmFbIMV4ctrVFijtB2Oj7q6LP5fJqiI2qRxE2o 6UPYEswa9Ohr/KsGj6GFSc/cPKrN2cpXZM1iPP691+AuDck152tQtNEQKYKGXboY+kwUnH 3O+VmGEGaA7sbrFE9bjt6Z67pyGJ7TG51uF8MYsvk1+hqk59tMRQ8n2GPIScRMzFgKJxpK gDXTxhXFIrQRQV5/1QJ9jQNJyjw/gRuK88qVPZ7CsCo/LW3Xfc/WbKSys7f4EQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742493582; a=rsa-sha256; cv=none; b=wVh5eJp5r2st3TKynfb927sq/CKZEAFx4VK3aYdBWAEF7RLSs5/w6uaNRjsttC0sla6u6u yT8IdBoxT2bkJ7SvC7XfF4Hzd2A2nyMrxcPii5J6RUdc5Ze9/Mh+cQQn7T9DOp3gJcQEnw arkyXfBIeq+6psYZxnGRyrZRbU19Hr4TVbg61VOa4j3PkObdOJfes7RB0pr5cJO7f+ZTqI QWh1a6g7G18lHEwqDN/T5GN5/ljSzNYPA1KsdR92/yAEZ1W/DlnWDi2e8gXJTfgqzEJt4D W4JoFHwSblj3P6FKYehDOwdxz5XqTe24XnfNDO7g7GPT6SE6WfFtXq9Q6z675g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742493582; 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=lpmZTRJwucFIA0+s6sOP64vOmrZ3leZB4BlYksziE80=; b=pwOORuqebu8AFP0KKK2rD/1+36jFOL0rknwb3i4o+w1vEdwb1H6pdZiSbGoFclx70NHNg0 Kbf61ErXUTRVA/GSnKm47uTN9WQjf2vdtQaEyhH2rVD3a9cu+R0OVX9sL2Adawd9USJPKQ /aPU66N5jmPf7+jUYRAb5c6Z4vT32ifpe75+puFYI7rnZy7/gcOFBvUwvPJsFQj9QofENg DMx/dejmJnl2sfZEyN1fPP79CE4+LN6T1tWPy02zvLCTDncZUwS5I480xM2VYL86/ITs/8 D0wN2bSAUfW13skK3KOZkIuE8Z/k6btEVyHsVQLyOBZq/TDllrG8ChT1eIcmCg== 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 4ZJYHy0Nqrz1Dqh; Thu, 20 Mar 2025 17:59:42 +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 52KHxfEW040558; Thu, 20 Mar 2025 17:59:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52KHxfF2040555; Thu, 20 Mar 2025 17:59:41 GMT (envelope-from git) Date: Thu, 20 Mar 2025 17:59:41 GMT Message-Id: <202503201759.52KHxfF2040555@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: fdc4db57224c - main - usr.bin/Makefile: always build ELF Tool Chain strings(1) 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fdc4db57224ce19b867c60fce4c410068be40c27 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=fdc4db57224ce19b867c60fce4c410068be40c27 commit fdc4db57224ce19b867c60fce4c410068be40c27 Author: Ed Maste AuthorDate: 2025-03-20 17:47:29 +0000 Commit: Ed Maste CommitDate: 2025-03-20 17:59:32 +0000 usr.bin/Makefile: always build ELF Tool Chain strings(1) strings(1) is not conditional on WITH_/WITHOUT_TOOLCHAIN, as it is a small utility that is also useful outside of the toolchain context. As of commit 1cae7121c667 we switched to WITH_LLVM_BINUTILS by default. After this change building world with default options but installing WITHOUT_TOOLCHAIN failed, because we would build LLVM's strings but attempt to install ELF Tool Chain's version, which did not exist. Address this by always including ELF Tool Chain strings in non-install make targets, so that it will be available if options are changed at install time. PR: 285556 Reported by: Michael Butler Reviewed by: brooks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D49425 --- usr.bin/Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/usr.bin/Makefile b/usr.bin/Makefile index bca7896e5a17..15fcdeb479f7 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -250,6 +250,12 @@ SUBDIR.${MK_TOOLCHAIN}+= nm SUBDIR.${MK_TOOLCHAIN}+= objcopy SUBDIR.${MK_TOOLCHAIN}+= readelf SUBDIR.${MK_TOOLCHAIN}+= size +.endif +# Include elftoolchain's strings in build targets even if using LLVM_BINUTILS, +# as we may later install with different options. In particular, the release +# artifact builds use default options for buildworld but install with +# MK_TOOLCHAIN=no which implies MK_LLVM_BINUTILS=no. +.if ${MK_LLVM_BINUTILS} == "no" || !make(install) SUBDIR+= strings .endif SUBDIR.${MK_TOOLCHAIN}+= c89