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

Revert r307689

Browse source 
The proposed change ("Fix building of llvm's unwind if gcc has been
also built") breaks the build with clang/llvm.

Tested with...

	(
	export SRCCONF=/dev/null WITH_CLANG=
	cd gnu/lib/libgcc; make obj; make depend; make all
	)

MFC after:	3 days
X-MFC with:	r307689
Pointyhat to:	bapt
Reported by:	Jenkins, O. Hartmann <ohartman@zedat.fu-berlin.de>
Sponsored by:	Dell EMC Isilon
This commit is contained in:
Enji Cooper 2016-10-21 04:49:39 +00:00
parent 90ea06dd8a
commit ae5f5e1c02
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=307699
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gnu/lib/libgcc/Makefile
View file

@ -30,7 +30,8 @@ CFLAGS+= -DTARGET_ARM_EABI
CFLAGS+= -DIN_GCC -DIN_LIBGCC2 -D__GCC_FLOAT_NOT_NEEDED \
-DHAVE_GTHR_DEFAULT \
-I${GCCLIB}/include \
-I${GCCDIR}/config -I${GCCDIR} -I.
-I${GCCDIR}/config -I${GCCDIR} -I. \
-I${CCDIR}/cc_tools
LDFLAGS+= -nodefaultlibs
LIBADD+= c
@ -101,12 +102,6 @@ CFLAGS+= -I${SRCTOP}/contrib/libc++/include
.else # MK_LLVM_LIBUNWIND
#
# Prevent the potential unwind.h from gcc (generated)
# to be in the include path before the one from llvm unwind
#
CFLAGS+= -I${CCDIR}/cc_tools
.if ${TARGET_CPUARCH} == "arm"
LIB2ADDEH = unwind-arm.c libunwind-arm.S pr-support.c unwind-c.c
.else