Date: Sat, 12 Mar 2022 18:21:27 GMT From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 4c622a8f051d - stable/13 - Build compiler-rt against libunwind, not libcxxrt Message-ID: <202203121821.22CILRXZ072932@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=4c622a8f051d8dd9fab0719b00a6eccdbd13ac62 commit 4c622a8f051d8dd9fab0719b00a6eccdbd13ac62 Author: Dimitry Andric <dim@FreeBSD.org> AuthorDate: 2022-03-09 21:23:35 +0000 Commit: Dimitry Andric <dim@FreeBSD.org> CommitDate: 2022-03-12 18:21:02 +0000 Build compiler-rt against libunwind, not libcxxrt Parts of compiler-rt are also built for libgcc_eh and libgcc_s, and these were already pointing to the libunwind unwind.h. For the sake of consistency, also build compiler-rt itself against the libunwind unwind.h, not the libcxxrt one. MFC after: 3 days (cherry picked from commit 7ecd99fa424df001028c5cddc52d25b29232f1af) --- lib/libcompiler_rt/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libcompiler_rt/Makefile b/lib/libcompiler_rt/Makefile index b23522b7e410..0e9f58cc3fc0 100644 --- a/lib/libcompiler_rt/Makefile +++ b/lib/libcompiler_rt/Makefile @@ -11,7 +11,7 @@ WARNS?= 2 CFLAGS+= ${PICFLAG} CFLAGS+= -fvisibility=hidden CFLAGS+= -DVISIBILITY_HIDDEN -CFLAGS+= -I${SRCTOP}/contrib/libcxxrt +CFLAGS+= -I${SRCTOP}/contrib/llvm-project/libunwind/include # gcc has incompatible internal declarations for __divtc3 and __multc3, but has # no option to silence its warning, so make warnings non-fatal.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202203121821.22CILRXZ072932>