git: 9c59d7533731 - stable/12 - libpmc: fix linking with C programs
Alan Somers
asomers at FreeBSD.org
Mon Feb 22 05:24:01 UTC 2021
The branch stable/12 has been updated by asomers:
URL: https://cgit.FreeBSD.org/src/commit/?id=9c59d753373189f83b4447fe6a5456573451e014
commit 9c59d753373189f83b4447fe6a5456573451e014
Author: Alan Somers <asomers at FreeBSD.org>
AuthorDate: 2021-02-21 20:56:57 +0000
Commit: Alan Somers <asomers at FreeBSD.org>
CommitDate: 2021-02-22 05:23:12 +0000
libpmc: fix linking with C programs
Revision r334749 Added some C++ code to libpmc. It didn't change the ABI,
but it did introduce a dependency on libc++. Nobody noticed because every
program that in the base system that uses libpmc is also C++.
Reported-by: Dom Dwyer <dom at itsallbroken.com>
Reviewed By: vangyzen
Differential Revision: https://reviews.freebsd.org/D28550
(cherry picked from commit 04e34c0202ea50cea67d5779f54bc612c74e6532)
---
lib/libpmc/Makefile | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/lib/libpmc/Makefile b/lib/libpmc/Makefile
index 35bacb26bd11..1e204e13fdb2 100644
--- a/lib/libpmc/Makefile
+++ b/lib/libpmc/Makefile
@@ -8,6 +8,12 @@ INCS= pmc.h pmclog.h pmcformat.h
CFLAGS+= -I${.CURDIR}
CWARNFLAGS.gcc+= -Wno-shadow -Wno-cast-align
+.include <bsd.compiler.mk>
+.if ${COMPILER_TYPE} == "gcc"
+LDADD+= -lstdc++
+.else
+LDADD+= -lc++
+.endif
.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
More information about the dev-commits-src-branches
mailing list