From nobody Tue May 02 17:14:50 2023 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 4Q9msl5B81z49CXS; Tue, 2 May 2023 17:14:51 +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 4Q9msl1VM4z3lwM; Tue, 2 May 2023 17:14:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683047691; 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=FiDt0BlQW4lNbqd5trpJ66R7cQUFOiAG01GtooSpzAk=; b=Fjn2spV43bFYArHP3IBfT0LJvvhsaayfaXSrCHslklRypEnzy1phcJ2bb9PVrhlfQgHDe2 sRYmUHn5qMxMjnKc9vlnUUOyp5SMrhjnpFRFF7rh3v3tRRh0uO4tvIwIas3vjX0zBKicYV KiZvmisvpQrO+tndbkX6DRTXPJU7WY6IhIDR3QajSiPf9YX55/sjNXqG5NVeWhZQcsGabv jeSbNmttvYcPqM+tSAwjjZsXHLknTJlWxM9gTxIQgrDMUb7THSZG7qVsZeauuFG+WQpnsb wLD5dDZ5UF0oRNAeEQiuxp68kyVeTrs2e+7gH6rppf/YtC6+l3JX1Lwrc6H4hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683047691; 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=FiDt0BlQW4lNbqd5trpJ66R7cQUFOiAG01GtooSpzAk=; b=f/aW9WHeXQHiTcnDl72Eg/di7wNf+0Yax7xoXL9ybV9XxzbTmMDAvA0Ua8d3V/pAZdN7KH mIK/UUzez15oZcq2uw7MJiNuAxjQuUZS/DJdGSzUad2ILouReFVBrA+KRsRDrsWmVqef1o 4HyJ7pllTwTijBZ+7zDwp5vSaBnesYn3wZbx/rroiMvecCD0khz39v0/jLXmAE2u/KfLmA rkPrhfYR8Yd1js4M8uqtL2abVDsywJqYKe7rflVDLbVwcHqRdc8pBninu3Lv5APrlXY6kl QpE6zTCAgS4CSntrIEJDJaBqE1DBBnllnhv/f8dtsr+Pm40bodnwmDwMPnngXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683047691; a=rsa-sha256; cv=none; b=t7Gd0OJnsfRA0cI7iHTOwnMtzDcYUP3Upcuxiusma91XOEKdRKaeZEyKgR08FUm6psdFTA wLxDGKRRaImSVIsl030R6Z6kTF92uZrGn6bj4xvWgWQzEQCylnhljdY44jcs8FIEjRaiGx SjSAiZtnKnKBOzyGHthmrrA+D5I+4nG6W4+/iAlZ4jDtnLxOAuoTBVwKAH16WhKyzHTeXJ EbqQ8WH0kPJlck9hGI6IuWMnPvBC3IevVEF4eoHogN2J2cW/4BTTyUC8TaeFqnK3v1sCpU ezo12t5Cu2H2ylj2nudwmglrzT6HmWhP95A12UFt7c79hT6HKOyx7vF8vsZ6PQ== 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 4Q9msl0XYKzwxr; Tue, 2 May 2023 17:14:51 +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 342HEoSF061121; Tue, 2 May 2023 17:14:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 342HEoEJ061120; Tue, 2 May 2023 17:14:50 GMT (envelope-from git) Date: Tue, 2 May 2023 17:14:50 GMT Message-Id: <202305021714.342HEoEJ061120@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 076116b88474 - stable/12 - libpmc: Use LIB_CXX instead of explicit LDADD to link a C++ library. 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 076116b884744947ca33e6a8ff1007bf260614af Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=076116b884744947ca33e6a8ff1007bf260614af commit 076116b884744947ca33e6a8ff1007bf260614af Author: John Baldwin AuthorDate: 2023-03-23 16:31:29 +0000 Commit: John Baldwin CommitDate: 2023-05-02 16:52:38 +0000 libpmc: Use LIB_CXX instead of explicit LDADD to link a C++ library. This uses the C++ compiler as the linker instead of the C compiler letting the compiler driver pick the right libraries. This is a no-op on main and stable/13 but matters for stable/12 where the current logic breaks for external GCC since it tries to use a non-existent libstdc++. Reviewed by: emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D39197 (cherry picked from commit c6b3f47fedd3f94f74cc4f7c40761b1d0e777f17) --- lib/libpmc/Makefile | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/lib/libpmc/Makefile b/lib/libpmc/Makefile index 1e204e13fdb2..973ce5a28687 100644 --- a/lib/libpmc/Makefile +++ b/lib/libpmc/Makefile @@ -1,19 +1,12 @@ # $FreeBSD$ -PACKAGE=lib${LIB} -LIB= pmc +LIB_CXX= pmc SRCS= libpmc.c pmclog.c libpmc_pmu_util.c libpmc_json.cc INCS= pmc.h pmclog.h pmcformat.h CFLAGS+= -I${.CURDIR} CWARNFLAGS.gcc+= -Wno-shadow -Wno-cast-align -.include -.if ${COMPILER_TYPE} == "gcc" -LDADD+= -lstdc++ -.else -LDADD+= -lc++ -.endif .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"