From nobody Fri Apr 21 16:51:04 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 4Q30sN2qXbz46cfd; Fri, 21 Apr 2023 16:51:04 +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 4Q30sN2JKhz3JXp; Fri, 21 Apr 2023 16:51:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682095864; 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=4UukjOpqH3bq1QlVTMYPH9Ch5TsyWKQEYlvQOymIV8I=; b=Biev65EpMWq/Egd2v/mosd+bn3xkNBPhbY9K58SkysQDJl0Sw573+Z8aZsBnP86VAw+y9k m9BDwllE2MyxIajuef9kikakAXfUY+H1sl5YSexFu2Jq/ui/anF8283tcnOknLf2O3IshA nnhcmj1Yt4g+W9CcGQqERmTosYlSpZBxaXlx1YZiJThCEis3DcijSQD3Rny0UxRubkzqgF L2fUbRgog0abVbmlHZclBo8KMhwosYN6kg1Al5AHUoOyLfRVrPTta4P4P230/QPWPdXmOf UIub6IjAse+6k+NDT36o1X0zgllMKYAlCUt8ZBvHck8EnVh0CbjI+IY/hIXEFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682095864; 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=4UukjOpqH3bq1QlVTMYPH9Ch5TsyWKQEYlvQOymIV8I=; b=tcZWq5BDbKmJLf9JlSATDxH38Dhv3IDlKz/6/OGEcdJIIBjycChot73O53VpPNx/nzqNxA 26fJh5+bDTTWNQFlPps5ei/D4PppP2SZbqthM666IkVpGcmxOYlvOsFAAY6etDYi3HC40I vnNHkhWRS3No7EgcrckqS1EfOAfQXDPM8OdlgzlpZKnC1G/67o68DJLYU4wyJtTpJ4XTzR rpUvDowY+M9iKqvgAW6hEk8emA9tBL1YllTniCcCS9b8dJW5QLRkHAa08IJFFMiIwee6tM WxuSbgeUj5mziEkniF5S21VRJjY2/k55uOauUihjQDPC7OQ3OEPU4cs9ex6wPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682095864; a=rsa-sha256; cv=none; b=UbmHb+Es4nUWToWlH113Y0dlkxfsdbR8iEuE765CWzB8DTZa3Xm82ZhG7Lepkl44rUD4E5 DqBmQc2Yw7cjLY0E7JWBGuuxrMIGH9fTQpTzOKby3OV0gWSt20qQM6PsB1ES4EZnQKcpfY 3yiWZpDh+RfVqsdPZmxgpBrVXf5q2ZNECFjM3aR9on/2Cht4/RXkzdCbgJdzOgO24fXgah L8gA7HumHqvepBfQjOpP7grOGvlyOr/ym7oaZi4gJXgZ6vnmmrBW+Q9COoFbZD1i7nd4ye gN7uSlSuv3UrsO7C4ROvkR6zd/gYOm0fdSfqUr0aYdRfTEF/5ZNEuHR/VmFkEw== 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 4Q30sN1M1jzSjG; Fri, 21 Apr 2023 16:51:04 +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 33LGp4MZ075594; Fri, 21 Apr 2023 16:51:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33LGp4GE075593; Fri, 21 Apr 2023 16:51:04 GMT (envelope-from git) Date: Fri, 21 Apr 2023 16:51:04 GMT Message-Id: <202304211651.33LGp4GE075593@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: 41df1d60e323 - main - llvm: fix some llvm-* tool links when WITH_LLVM_BINUTILS is set 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 41df1d60e3237df2106dddf357e3205bf29f85d5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=41df1d60e3237df2106dddf357e3205bf29f85d5 commit 41df1d60e3237df2106dddf357e3205bf29f85d5 Author: Ed Maste AuthorDate: 2023-04-21 13:11:45 +0000 Commit: Ed Maste CommitDate: 2023-04-21 16:49:05 +0000 llvm: fix some llvm-* tool links when WITH_LLVM_BINUTILS is set A few Makefiles overrode LINKS and MLINKS when WITH_LLVM_BINUTILS was set, which caused some llvm- prefixed tools to disappear. One such case was llvm-ranlib, which some ports invoke explicitly. Use += when adding to LINKS and MLINKS under WITH_LLVM_BINUTILS. PR: 270955, 270956, 270959 Submitted by: jbeich Reviewed by: arichardson Fixes: 021385aba562 ("Add WITH_LLVM_BINUTILS to install LLVM binuti...") Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D39747 --- usr.bin/clang/llvm-ar/Makefile | 4 ++-- usr.bin/clang/llvm-nm/Makefile | 4 ++-- usr.bin/clang/llvm-size/Makefile | 4 ++-- usr.bin/clang/llvm-symbolizer/Makefile | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/usr.bin/clang/llvm-ar/Makefile b/usr.bin/clang/llvm-ar/Makefile index a6a480bce359..3718248f5de9 100644 --- a/usr.bin/clang/llvm-ar/Makefile +++ b/usr.bin/clang/llvm-ar/Makefile @@ -15,8 +15,8 @@ LIBADD+= z LINKS+= ${BINDIR}/llvm-ar ${BINDIR}/llvm-ranlib .if ${MK_LLVM_BINUTILS} != "no" -LINKS= ${BINDIR}/llvm-ar ${BINDIR}/ar ${BINDIR}/llvm-ar ${BINDIR}/ranlib -MLINKS= llvm-ar.1 ar.1 llvm-ar.1 ranlib.1 +LINKS+= ${BINDIR}/llvm-ar ${BINDIR}/ar ${BINDIR}/llvm-ar ${BINDIR}/ranlib +MLINKS+= llvm-ar.1 ar.1 llvm-ar.1 ranlib.1 .endif .include "../llvm.prog.mk" diff --git a/usr.bin/clang/llvm-nm/Makefile b/usr.bin/clang/llvm-nm/Makefile index 0df48744632d..e0c41e4a0254 100644 --- a/usr.bin/clang/llvm-nm/Makefile +++ b/usr.bin/clang/llvm-nm/Makefile @@ -26,8 +26,8 @@ CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} LIBADD+= z .if ${MK_LLVM_BINUTILS} != "no" -LINKS= ${BINDIR}/llvm-nm ${BINDIR}/nm -MLINKS= llvm-nm.1 nm.1 +LINKS+= ${BINDIR}/llvm-nm ${BINDIR}/nm +MLINKS+= llvm-nm.1 nm.1 .endif .include "../llvm.prog.mk" diff --git a/usr.bin/clang/llvm-size/Makefile b/usr.bin/clang/llvm-size/Makefile index 20bd5de61192..bce5cf834e0c 100644 --- a/usr.bin/clang/llvm-size/Makefile +++ b/usr.bin/clang/llvm-size/Makefile @@ -24,8 +24,8 @@ DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} .if ${MK_LLVM_BINUTILS} != "no" -LINKS= ${BINDIR}/llvm-size ${BINDIR}/size -MLINKS= llvm-size.1 size.1 +LINKS+= ${BINDIR}/llvm-size ${BINDIR}/size +MLINKS+= llvm-size.1 size.1 .endif .include "../llvm.prog.mk" diff --git a/usr.bin/clang/llvm-symbolizer/Makefile b/usr.bin/clang/llvm-symbolizer/Makefile index c4677169f912..fcaf8facf1b8 100644 --- a/usr.bin/clang/llvm-symbolizer/Makefile +++ b/usr.bin/clang/llvm-symbolizer/Makefile @@ -29,8 +29,8 @@ LIBADD+= z LINKS+= ${BINDIR}/llvm-symbolizer ${BINDIR}/llvm-addr2line .if ${MK_LLVM_BINUTILS} != "no" -LINKS= ${BINDIR}/llvm-symbolizer ${BINDIR}/addr2line -MLINKS= llvm-addr2line.1 addr2line.1 +LINKS+= ${BINDIR}/llvm-symbolizer ${BINDIR}/addr2line +MLINKS+= llvm-addr2line.1 addr2line.1 .endif .include "../llvm.prog.mk"