From nobody Tue May 02 17:14:44 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 4Q9msd2rXSz49CCt; Tue, 2 May 2023 17:14: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q9msd0QCYz3lkg; Tue, 2 May 2023 17:14:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683047685; 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=AQ+qPgtmJl02weQUt5tImpKbNf+TBfxRLMFmpxE/S7Q=; b=V+Ht2RJTuuxVlTpmpmrKQb0DrCabftxwhN2UPV8w0k2RRNLiRk+DFNr8CvBZAfUO4+uAoU kWDdxYMcJwVGRpa2q1IxUuph+sqj3e5pLpJ/Z1+mVVl7uZEzQJQ1soOWrZS7At2iBbYQd9 NnHS61a4JYSsGYX/RSE0DEAEt+EuwUd2+nGkGTvKN1Y8zOMCXymhOM8z7j+zBBmoKnAHrH 0wF6wBFWWQVx1iwKOdzeKpWJep6UanJHWxkptrh+0OhTyaBsO/NC8y9o5McGTvEcYrHgpi Wk0EGRtt05C2yeDsiasBByQlMT9IhV9Sr0tvCIsCFKGpoGBi+b0kJhXnfkK+Gg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683047685; 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=AQ+qPgtmJl02weQUt5tImpKbNf+TBfxRLMFmpxE/S7Q=; b=Av6t9iqiQ/qdo3LMxuzkU5OXEuJ8B/aWqmPlsm1Hx6qJ7PtofkbEphicoQmk3eyOR0P5wp tPOqAZ0iT/AbnnFe6ItTUh+FyDnFvn+JH2CF3rydMqMwoDM1qRuR8MQghY0SHX0ITPeaHW DR3eUQSFb0ksx5/JNEuKU66AVXkLJs45oOuIzKQAlYLJ74HkxSBhUWIy+7QwrmaObbt5XB SYai4L307QZX71difQdpjR5LOy6I+5lvhASYk0lj/rOJBDGGUvadj2Xk55lbOsasVyUp7j 6FEFQIbFvyx1bWrtYdqpsGGmlXQ86QBaLCxjFCycbZHOUBuhXnuSwDlND2hq4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683047685; a=rsa-sha256; cv=none; b=S6npEA2ZpuMLzkZFiVyC53hI10euZRjmLiIDvUtYhxpaWNFYpiBqBYLhkNawmm2Ca/EsCR 3L79RKgGMjve8XAMYUL2YdCdY8onn/6R0xxNdv2Q0aJJqaRWoRHiM7F0S2+RDaLjQqV2jI /jb5nX14COylVbd/vl0+SGPfjmT5WJl0cnxBEFkoeWqQ4vFIWfsJXyxafbqGuP09GJb7B5 AU3bFxB1UE4PrAS0VhSFRInv6ZGB/WndoIoeJvCWSKBtoQkW1vUgDYA/Uiqqweaj8wo+7A OUbfZNpfNnr4Adcw0v0Tw7QUrSAzHEJ5KNkqA1+ghmED/TiclV3076E1BPnbYQ== 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 4Q9msc6c5szwVN; Tue, 2 May 2023 17:14:44 +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 342HEiPV060992; Tue, 2 May 2023 17:14:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 342HEiUY060991; Tue, 2 May 2023 17:14:44 GMT (envelope-from git) Date: Tue, 2 May 2023 17:14:44 GMT Message-Id: <202305021714.342HEiUY060991@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: f5db29b8ceb5 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: f5db29b8ceb59f2ebb6fb836534f5f4a770f2c65 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=f5db29b8ceb59f2ebb6fb836534f5f4a770f2c65 commit f5db29b8ceb59f2ebb6fb836534f5f4a770f2c65 Author: John Baldwin AuthorDate: 2023-03-23 16:31:29 +0000 Commit: John Baldwin CommitDate: 2023-05-02 16:49: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 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/libpmc/Makefile b/lib/libpmc/Makefile index 2ef0d288064c..65ddb7f48b59 100644 --- a/lib/libpmc/Makefile +++ b/lib/libpmc/Makefile @@ -1,12 +1,11 @@ # $FreeBSD$ -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${SRCTOP}/${RELDIR:H}/libpmcstat -LDADD+= -lc++ .if ${MACHINE_CPUARCH} == "aarch64" EVENT_ARCH="arm64"