diff options
| author |   patrick <patrick@openbsd.org> | 2021-01-02 17:50:15 +0000 |
|---|---|---|
| committer | patrick <patrick@openbsd.org> | 2021-01-02 17:50:15 +0000 |
| commit | dc59726f70d6fba80243bdb6e1a7ce1c972b21ab (patch) | |
| tree | f628b77819c4b682e268ece7438a0d94fc697bdd /lib | |
| parent | Merge compiler-rt 11.0.0. (diff) | |
| download | wireguard-openbsd-dc59726f70d6fba80243bdb6e1a7ce1c972b21ab.tar.xz wireguard-openbsd-dc59726f70d6fba80243bdb6e1a7ce1c972b21ab.zip | |
Switch libc++ and libc++abi to use libunwind 11.0.0. Bump major for both
libraries due to dynamic export additions and removals in libc++abi.
Tested by kettenis@, visa@ and myself
ok kettenis@
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libcxx/Makefile | 4 | ||||
| -rw-r--r-- | lib/libcxx/shlib_version | 2 | ||||
| -rw-r--r-- | lib/libcxxabi/Makefile | 6 | ||||
| -rw-r--r-- | lib/libcxxabi/shlib_version | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/lib/libcxx/Makefile b/lib/libcxx/Makefile index 331be7a85ae..d8d181e91a7 100644 --- a/lib/libcxx/Makefile +++ b/lib/libcxx/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.14 2019/06/17 22:28:47 patrick Exp $ +# $OpenBSD: Makefile,v 1.15 2021/01/02 17:50:15 patrick Exp $ .include <bsd.own.mk> @@ -12,7 +12,7 @@ CXX= clang++ HDRDIR= ${.CURDIR}/include SRCDIR= ${.CURDIR}/src AHDRDIR= ${.CURDIR}/../libcxxabi/include -UHDRDIR= ${.CURDIR}/../libunwind/include +UHDRDIR= ${.CURDIR}/../../gnu/llvm/libunwind/include CXXINCLUDEDIR= /usr/include/c++/v1 .PATH: ${SRCDIR} ${SRCDIR}/filesystem diff --git a/lib/libcxx/shlib_version b/lib/libcxx/shlib_version index 3066b9771e7..9c1551636c5 100644 --- a/lib/libcxx/shlib_version +++ b/lib/libcxx/shlib_version @@ -1,2 +1,2 @@ -major=5 +major=6 minor=0 diff --git a/lib/libcxxabi/Makefile b/lib/libcxxabi/Makefile index 9d57c27d15e..a69385fa085 100644 --- a/lib/libcxxabi/Makefile +++ b/lib/libcxxabi/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2019/03/14 08:44:46 robert Exp $ +# $OpenBSD: Makefile,v 1.13 2021/01/02 17:50:15 patrick Exp $ .include <bsd.own.mk> @@ -12,10 +12,10 @@ CXX= clang++ HDRDIR= ${.CURDIR}/include SRCDIR= ${.CURDIR}/src SHDRDIR= ${.CURDIR}/../libcxx/include -UHDRDIR= ${.CURDIR}/../libunwind/include +UHDRDIR= ${.CURDIR}/../../gnu/llvm/libunwind/include CXXINCLUDEDIR= /usr/include/c++/v1 -.PATH: ${SRCDIR} ${.CURDIR}/../libunwind/src +.PATH: ${SRCDIR} ${.CURDIR}/../../gnu/llvm/libunwind/src LIB= c++abi diff --git a/lib/libcxxabi/shlib_version b/lib/libcxxabi/shlib_version index 43093ef4a98..9b77ea1766d 100644 --- a/lib/libcxxabi/shlib_version +++ b/lib/libcxxabi/shlib_version @@ -1,3 +1,3 @@ # Don't forget to give libc++ the same type of bump! -major=3 +major=4 minor=0 |