summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gnu/lib/libgcc/Makefile9
1 files changed, 7 insertions, 2 deletions
diff --git a/gnu/lib/libgcc/Makefile b/gnu/lib/libgcc/Makefile
index b101b4f2ea91..461a236b84fd 100644
--- a/gnu/lib/libgcc/Makefile
+++ b/gnu/lib/libgcc/Makefile
@@ -30,8 +30,7 @@ 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${CCDIR}/cc_tools
+ -I${GCCDIR}/config -I${GCCDIR} -I.
LDFLAGS+= -nodefaultlibs
LIBADD+= c
@@ -102,6 +101,12 @@ 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