mischief/openbsd-src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2025-01-04 23:35:36 -08:00
Code

Move Makefiles for libc++ and libc++abi to gnu/lib in preparation for an

Browse Source 
upcoming update to those, which will see both codebases heading into the
gnu/llvm dumpster.

Feedback from jsg@
ok deraadt@ kettenis@
This commit is contained in:
patrick 2021-01-02 20:04:36 +00:00
parent 14dc839606
commit f950054f2b
7 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gnu/lib/Makefile
View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.23 2020/08/10 21:09:39 patrick Exp $
# $OpenBSD: Makefile,v 1.24 2021/01/02 20:04:36 patrick Exp $
.include <bsd.own.mk>
SUBDIR+=libcompiler_rt libiberty libreadline
SUBDIR+=libcxxabi libcxx
.if make(obj)
SUBDIR+=libstdc++ libstdc++-v3 libsupc++-v3
.else

10
lib/libcxx/Makefile → gnu/lib/libcxx/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.15 2021/01/02 17:50:15 patrick Exp $
# $OpenBSD: Makefile,v 1.1 2021/01/02 20:04:36 patrick Exp $
.include <bsd.own.mk>
@ -9,10 +9,10 @@ CXX= clang++
.if ${BUILD_CLANG:L} == "yes"
HDRDIR= ${.CURDIR}/include
SRCDIR= ${.CURDIR}/src
AHDRDIR= ${.CURDIR}/../libcxxabi/include
UHDRDIR= ${.CURDIR}/../../gnu/llvm/libunwind/include
HDRDIR= ${.CURDIR}/../../../lib/libcxx/include
SRCDIR= ${.CURDIR}/../../../lib/libcxx/src
AHDRDIR= ${.CURDIR}/../../../lib/libcxxabi/include
UHDRDIR= ${.CURDIR}/../../../gnu/llvm/libunwind/include
CXXINCLUDEDIR= /usr/include/c++/v1
.PATH: ${SRCDIR} ${SRCDIR}/filesystem

0
lib/libcxx/shlib_version → gnu/lib/libcxx/shlib_version
View File

12
lib/libcxxabi/Makefile → gnu/lib/libcxxabi/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.13 2021/01/02 17:50:15 patrick Exp $
# $OpenBSD: Makefile,v 1.1 2021/01/02 20:04:36 patrick Exp $
.include <bsd.own.mk>
@ -9,13 +9,13 @@ CXX= clang++
.if ${BUILD_CLANG:L} == "yes"
HDRDIR= ${.CURDIR}/include
SRCDIR= ${.CURDIR}/src
SHDRDIR= ${.CURDIR}/../libcxx/include
UHDRDIR= ${.CURDIR}/../../gnu/llvm/libunwind/include
HDRDIR= ${.CURDIR}/../../../lib/libcxxabi/include
SRCDIR= ${.CURDIR}/../../../lib/libcxxabi/src
SHDRDIR= ${.CURDIR}/../../../lib/libcxx/include
UHDRDIR= ${.CURDIR}/../../../gnu/llvm/libunwind/include
CXXINCLUDEDIR= /usr/include/c++/v1
.PATH: ${SRCDIR} ${.CURDIR}/../../gnu/llvm/libunwind/src
.PATH: ${SRCDIR} ${.CURDIR}/../../../gnu/llvm/libunwind/src
LIB= c++abi

0
lib/libcxxabi/shlib_version → gnu/lib/libcxxabi/shlib_version
View File

4
include/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.227 2020/10/26 15:50:31 martijn Exp $
# $OpenBSD: Makefile,v 1.228 2021/01/02 20:04:36 patrick Exp $
# $NetBSD: Makefile,v 1.59 1996/05/15 21:36:43 jtc Exp $
# @(#)Makefile 5.45.1.1 (Berkeley) 5/6/91
@ -60,7 +60,7 @@ PRDIRS+= ../gnu/lib/libstdc++
PRDIRS+= ../gnu/lib/libstdc++-v3 ../gnu/usr.bin/cc/include
.endif
.if ${BUILD_CLANG:L} == "yes"
RDIRS+= ../lib/libcxxabi ../lib/libcxx \
RDIRS+= ../gnu/lib/libcxxabi ../gnu/lib/libcxx \
../gnu/usr.bin/clang/libLLVM
.endif

4
lib/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.80 2020/09/22 10:31:46 martijn Exp $
# $OpenBSD: Makefile,v 1.81 2021/01/02 20:04:36 patrick Exp $
# $NetBSD: Makefile,v 1.20.4.1 1996/06/14 17:22:38 cgd Exp $
SUBDIR= csu libagentx libarch libc libcbor libcrypto libcurses \
libcxxabi libcxx libedit libelf libevent libexpat \
libedit libelf libevent libexpat \
libfido2 libform libfuse libkeynote libkvm libl libm libmenu \
libossaudio libpanel libpcap libradius librthread \
librpcsvc libskey libsndio libssl libtls libusbhid \