Date: Fri, 21 Oct 2016 04:49:39 +0000 (UTC) From: Ngie Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r307699 - head/gnu/lib/libgcc Message-ID: <201610210449.u9L4ndCA071297@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Fri Oct 21 04:49:39 2016 New Revision: 307699 URL: https://svnweb.freebsd.org/changeset/base/307699 Log: Revert r307689 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 Modified: head/gnu/lib/libgcc/Makefile Modified: head/gnu/lib/libgcc/Makefile ============================================================================== --- head/gnu/lib/libgcc/Makefile Fri Oct 21 03:23:17 2016 (r307698) +++ head/gnu/lib/libgcc/Makefile Fri Oct 21 04:49:39 2016 (r307699) @@ -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++/incl .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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610210449.u9L4ndCA071297>