system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-21 18:27:22 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

DIRDEPS_BUILD: libgcc now depends on MK_LLVM_LIBUNWIND

Browse source 
The dependency on gnu/lib/libgcc or lib/libgcc* is determined
at 'make dirdeps' time.

Sponsored by:	Dell EMC Isilon
This commit is contained in:
Bryan Drewery 2017-10-31 00:03:36 +00:00
parent 83f4f35130
commit a160cbfa07
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=325181
7 changed files with 58 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/libgcc_eh/Makefile.depend Normal file
View file

@ -0,0 +1,13 @@
# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
include \
include/xlocale \
.include <dirdeps.mk>
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
.endif

3
lib/libgcc_eh/Makefile.inc
View file

@ -29,7 +29,8 @@ CXXFLAGS+= -std=c++11
.endif
CXXFLAGS+= -fno-rtti
STATIC_CXXFLAGS+= -fvisibility=hidden -fPIC
# Probably need to just move this earlier or use CXXFLAGS
.if ${MK_DIRDEPS_BUILD} == "yes"
# Avoid dependency on lib/libc++
CFLAGS+= -I${SRCTOP}/contrib/libc++/include
CFLAGS+= -isystem ${SRCTOP}/contrib/libc++/include -nostdinc++
.endif

16
lib/libgcc_s/Makefile.depend Normal file
View file

@ -0,0 +1,16 @@
# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
.include <dirdeps.mk>
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
# local dependencies - needed for -jN in clean tree
.endif

15
share/mk/local.dirdeps.mk
View file

@ -76,6 +76,19 @@ DIRDEPS += \
cddl/usr.bin/ctfmerge.host
.endif
# Add in proper libgcc (gnu or LLVM) if not building libcc and libc is needed.
# Add both gcc_s and gcc_eh as dependencies as the decision to build
# -static or not is not known here.
.if ${DEP_RELDIR:M*libgcc*} == "" && ${DIRDEPS:Mlib/libc}
.if ${MK_LLVM_LIBUNWIND} == "yes"
DIRDEPS+= \
lib/libgcc_eh \
lib/libgcc_s
.else
DIRDEPS+= gnu/lib/libgcc
.endif
.endif
# Bootstrap support. Give hints to DIRDEPS if there is no Makefile.depend*
# generated yet. This can be based on things such as SRC files and LIBADD.
# These hints will not factor into the final Makefile.depend as only what is
@ -124,7 +137,6 @@ _SRCS= ${SRCS} ${_PROGS_SRCS}
# Has C files. The C_DIRDEPS are shared with C++ files as well.
C_DIRDEPS= \
gnu/lib/csu \
gnu/lib/libgcc \
include \
include/arpa \
include/protocols \
@ -135,6 +147,7 @@ C_DIRDEPS= \
lib/libc \
lib/libcompiler_rt \
# libgcc is needed as well but is added later.
.if ${MK_GSSAPI} != "no"
C_DIRDEPS+= include/gssapi

3
share/mk/local.gendirdeps.mk
View file

@ -10,6 +10,9 @@ GENDIRDEPS_FILTER+= \
Ngnu/lib/libssp/libssp_nonshared \
Ncddl/usr.bin/ctf* \
Nlib/libc_nonshared \
Ngnu/lib/libgcc \
Nlib/libgcc_eh \
Nlib/libgcc_s \
Ntargets/pseudo/stage* \
Ntools/*

5
targets/pseudo/userland/gnu/Makefile.depend
View file

@ -9,7 +9,6 @@
DIRDEPS = \
gnu/lib/csu \
gnu/lib/libdialog \
gnu/lib/libgcc \
gnu/lib/libgcov \
gnu/lib/libgomp \
gnu/lib/libreadline/history/doc \
@ -45,4 +44,8 @@ DIRDEPS = \
DIRDEPS+= gnu/usr.bin/dtc
.endif
.if ${MK_LLVM_LIBUNWIND} == "no"
DIRDEPS+= gnu/lib/libgcc
.endif
.include <dirdeps.mk>

6
targets/pseudo/userland/lib/Makefile.depend
View file

@ -224,6 +224,12 @@ DIRDEPS+= lib/libgpio
DIRDEPS+= lib/libefivar
.endif
.if ${MK_LLVM_LIBUNWIND} != "no"
DIRDEPS+= \
lib/libgcc_eh \
lib/libgcc_s
.endif
.if ${MK_OFED} != "no"
DIRDEPS+= \
contrib/ofed/usr.lib/libcxgb4 \