Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unwind.h has a new problem, and fix the grabbing of x86 specific files.

Browse Source
This commit is contained in:
mrg 2016-03-16 05:47:43 +00:00
parent 2084d61b21
commit a37431532b
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tools/gcc/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.78 2016/03/15 21:38:32 mrg Exp $
# $NetBSD: Makefile,v 1.79 2016/03/16 05:47:43 mrg Exp $
.include <bsd.own.mk>
@ -87,13 +87,11 @@ BUILD_MAKE=${TOOL_GMAKE}
MKNATIVE_CONFIG_TARGET_LIBS=
.if ${HAVE_GCC} >= 50
MKNATIVE_CONFIG_TARGET_LIBS+= configure-target-libgcc
MKNATIVE_CONFIG_TARGET_LIBS+= configure-target-libgomp
.if ${HAVE_GCC} == 53
MKNATIVE_TARGET= gcc5
.elif ${HAVE_GCC} == 48
MKNATIVE_CONFIG_TARGET_LIBS+= configure-target-libgcc
MKNATIVE_CONFIG_TARGET_LIBS+= configure-target-libgomp
MKNATIVE_TARGET= gcc48
.endif
@ -195,6 +193,12 @@ NATIVE_CONFIGURE_ARGS+= \
--with-sysroot=${DESTDIR}
MKENV_BUILD_MAKE=cd .native && ${MKNATIVE_ENV} ${BUILD_MAKE}
UNWIND_H=unwind.h
# XXXGCC5
.if ${HAVE_GCC} == 53
UNWIND_H=
.endif
.native/.configure_done: ${_GNU_CFGSRC} ${.CURDIR}/Makefile
mkdir .native 2>/dev/null || true
PATH=${TOOLDIR}/bin:$$PATH; export PATH; \
@ -217,9 +221,10 @@ MKENV_BUILD_MAKE=cd .native && ${MKNATIVE_ENV} ${BUILD_MAKE}
PATH=${TOOLDIR}/bin:$$PATH; export PATH; \
(cd .native/gcc && ${MKNATIVE_ENV} ${BUILD_MAKE} -e tree-check.h config.h multilib.h gcov-iov.h)
PATH=${TOOLDIR}/bin:$$PATH; export PATH; \
(cd .native/gcc && ${MKNATIVE_ENV} ${BUILD_MAKE} -e libgcc.mvars tconfig.h unwind.h); \
(cd .native/gcc && ${MKNATIVE_ENV} ${BUILD_MAKE} -e libgcc.mvars tconfig.h ${UNWIND_H}); \
(cd .native && touch gcc/cc1obj gcc/cc1plus gcc/f771 gcc/libgcc.a gcc/libgcc_s.so)
.if !empty(${EXTRA_GCC_TARGETS})
.if defined(EXTRA_GCC_TARGETS)
PATH=${TOOLDIR}/bin:$$PATH; export PATH; \
(cd .native/gcc && ${MKNATIVE_ENV} ${BUILD_MAKE} -e ${EXTRA_GCC_TARGETS})
.endif
.for _lib in ${MKNATIVE_CONFIG_TARGET_LIBS}
@ -242,11 +247,6 @@ MKENV_BUILD_MAKE=cd .native && ${MKNATIVE_ENV} ${BUILD_MAKE}
CPP=${CPP:Q}' '-I${DESTDIR}/usr/include \
all-local) && \
true
.if 0
PATH=${TOOLDIR}/bin:$$PATH; export PATH; \
(cd .native/${MACHINE_GNU_PLATFORM}/libiberty && \
${MKNATIVE_ENV} ${BUILD_MAKE} needed-list)
.endif
@touch $@
clean: clean.native