From nobody Tue Apr 1 12:53:45 2025 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 4ZRnxP4zjZz5rVHQ; Tue, 01 Apr 2025 12:53:45 +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 4ZRnxP49Nrz3D8r; Tue, 01 Apr 2025 12:53:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743512025; 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=CCt27zinJ2OWYbOZg7orIh5gJA+80VLQ8oT/uFz97ec=; b=yxU/kSDAygLbxe7+toJWjFY2sXiiClrAOCMTM58sxA2wRfvR9FVD8vU42NJd++2MlQtwgo hK6rLgNk/iNbSFmf9NfBrnBIvvKzYEsoMN95xxrxdO7gunW++KIRVg9z1Dh18yGeLD8zbj lgZt4W52WSUecOj4o2R+CELsdjuwcYF7Rf462nMlPPHn3Zj8tsomkPEqfHUCoLXIgD2jgh NXAP1AjYiPTTNdq5on0K3GyNOSP1gb9sDE9Ik+45gbHhLw57lkL/aDugmmtMGj4ilQxxeZ FMJf7bZXIw44JDxSz2Rvyw/+tQQHRdblaK5oSa/sdxXtpz+H0Vb+ojdfFsCtNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743512025; a=rsa-sha256; cv=none; b=rRCmBcA7Yv8TbLCElY/nR3dL8rJtMRJmQxnnEeKLUQOwKLkdEiGjISKPg9zLwXVE9xLTsL fPnpT3ipRwB8mzpL3rRIbjTv8DLHS0TsaKq2jUsvhYbpwOBQqkionQ30cM5hbopVguv+Vi ub6Qn3VcurNfqQNsHgcvsZF3y/9Fs6U4m0LkopyHPu2lhp1SVELOIBDgRlMhwfWuttm7Iz srlG4qvqwL3g7/A/j/gKSeDrIe4z2Hw6F3CnUCVsWZtzXmGjcuO1TB8Y8YFIcKrVPmuWTK 69nW37YpzRQr1sRWsoC42qLVB4IC2LKaed/Ik2EBgrm6SuN8c6SzDoQfwvZ11Q== 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=1743512025; 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=CCt27zinJ2OWYbOZg7orIh5gJA+80VLQ8oT/uFz97ec=; b=ppQ4SQ0LP2KG6qG3JmLEaaWK1ztXu6LYHmLtDRjDaeR3EoGEBbLuOj8keuPRBe0x9DBZWj LVCXDyXvbXjUkn1ElyqTlMFAUEqprwDyfxt87h6Ko7uF0HBzQDYMab4jsR6P3eSk0X1HNY GqR1LXlZ9m7rQUG030L3nTyqa+psLJbaIui4cHVyk9geNzb8GhqReSYS2xyvw572pHuOLQ KI+vZExkk0OK8Xvj0gXcu8Jbf2dAsu846Irifgydiu7Lao8X0nTh1QNcE2Xn/YkoMi9aRG hw4BHZgtjDUulukDqaZ3zlrgZ212hAQJ9MzhhNQiD4ZpijOrMtyCwlZUUuY+bg== 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 4ZRnxP3fhJzXZk; Tue, 01 Apr 2025 12:53:45 +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 531CrjmN009212; Tue, 1 Apr 2025 12:53:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 531CrjcW009209; Tue, 1 Apr 2025 12:53:45 GMT (envelope-from git) Date: Tue, 1 Apr 2025 12:53:45 GMT Message-Id: <202504011253.531CrjcW009209@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: e683e7e0f887 - stable/14 - usr.bin/Makefile: always build ELF Tool Chain strings(1) 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e683e7e0f887216b52dfd64db226f0a6d3ce853a Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e683e7e0f887216b52dfd64db226f0a6d3ce853a commit e683e7e0f887216b52dfd64db226f0a6d3ce853a Author: Ed Maste AuthorDate: 2025-03-20 17:47:29 +0000 Commit: Ed Maste CommitDate: 2025-04-01 12:52:53 +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 (cherry picked from commit fdc4db57224ce19b867c60fce4c410068be40c27) --- usr.bin/Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 58945f7ecb18..02c6018af6e1 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -258,6 +258,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