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

fix a bunch of paths to look in the right places for gcc 4.5.

Browse Source
This commit is contained in:
mrg 2011-06-23 11:47:12 +00:00
parent c66a1ac524
commit 8049a32395
12 changed files with 38 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
external/gpl3/gcc/lib/crtstuff/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1 2011/06/21 06:02:25 mrg Exp $
# $NetBSD: Makefile,v 1.2 2011/06/23 11:47:12 mrg Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@ -9,9 +9,9 @@ NOLINT= # defined
# supplied by that toolchain's run-time support.
.if !defined(EXTERNAL_TOOLCHAIN) && ${MKGCC} != "no"
DIST= ${NETBSDSRCDIR}/gnu/dist/gcc4
DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
GNUHOSTDIST= ${DIST}
GCCARCH= ${NETBSDSRCDIR}/gnu/usr.bin/gcc4/arch/${MACHINE_ARCH}
GCCARCH= ${NETBSDSRCDIR}/external/gpl3/gcc/usr.bin/gcc/arch/${MACHINE_ARCH}
GALLCFLAGS= ${G_CRTSTUFF_CFLAGS} ${G_CRTSTUFF_T_CFLAGS}

10
external/gpl3/gcc/lib/libgcc/Makefile.inc vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.inc,v 1.1 2011/06/21 06:02:25 mrg Exp $
# $NetBSD: Makefile.inc,v 1.2 2011/06/23 11:47:12 mrg Exp $
.if ${MKGCC} != "no"
.if exists(${.CURDIR}/../arch/${MACHINE_ARCH}.mk)
@ -8,11 +8,11 @@
UNSUPPORTED_COMPILER.clang= # defined
DIST= ${NETBSDSRCDIR}/gnu/dist/gcc4
DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
GNUHOSTDIST= ${DIST}
GCCARCH= ${NETBSDSRCDIR}/gnu/usr.bin/gcc4/arch/${MACHINE_ARCH}
GCCARCHLIBGCC= ${NETBSDSRCDIR}/gnu/lib/libgcc4/arch/${MACHINE_ARCH}
GCCARCHXX= ${NETBSDSRCDIR}/gnu/lib/libstdc++-v3_4/arch/${MACHINE_ARCH}
GCCARCH= ${NETBSDSRCDIR}/external/gpl3/gcc/usr.bin/gcc/arch/${MACHINE_ARCH}
GCCARCHLIBGCC= ${NETBSDSRCDIR}/external/gpl3/gcc/lib/libgcc/arch/${MACHINE_ARCH}
GCCARCHXX= ${NETBSDSRCDIR}/external/gpl3/gcc/lib/libstdc++-v3/arch/${MACHINE_ARCH}
GCPPFLAGS= ${G_LIBGCC2_CFLAGS} ${G_USE_COLLECT2} ${G_INCLUDES}
CPPFLAGS+= -I${.CURDIR} -I${GCCARCHLIBGCC}

4
external/gpl3/gcc/lib/libiberty/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1 2011/06/21 06:02:27 mrg Exp $
# $NetBSD: Makefile,v 1.2 2011/06/23 11:47:12 mrg Exp $
LIBISPRIVATE= yes
@ -8,7 +8,7 @@ LIB= iberty
.include "${.CURDIR}/defs.mk"
DIST= ${NETBSDSRCDIR}/gnu/dist/gcc4
DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
GNUHOSTDIST= ${DIST}
SRCS= ${G_REQUIRED_OFILES:.o=.c} ${G_EXTRA_OFILES:.o=.c} \

19
external/gpl3/gcc/lib/libobjc/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1 2011/06/21 06:02:27 mrg Exp $
# $NetBSD: Makefile,v 1.2 2011/06/23 11:47:12 mrg Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@ -25,13 +25,13 @@ EXTRA_FAKEHEADERS=
EXTRA_FAKEHEADERS= options.h
.endif
LIBGCCOBJ!= cd ${.CURDIR}/../libgcc4/libgcc && ${PRINTOBJDIR}
LIBGCCOBJ!= cd ${.CURDIR}/../libgcc/libgcc && ${PRINTOBJDIR}
DIST= ${NETBSDSRCDIR}/gnu/dist/gcc4
GNUHOSTDIST= ${NETBSDSRCDIR}/gnu/dist/gcc4
GCCARCH= ${NETBSDSRCDIR}/gnu/usr.bin/gcc4/arch/${MACHINE_ARCH}
LIBOBJCARCH= ${NETBSDSRCDIR}/gnu/lib/libobjc4/arch/${MACHINE_ARCH}
GCCLIBXX= ${NETBSDSRCDIR}/gnu/lib/libstdc++-v3_4/arch/${MACHINE_ARCH}
DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
GNUHOSTDIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
GCCARCH= ${NETBSDSRCDIR}/external/gpl3/gcc/usr.bin/gcc/arch/${MACHINE_ARCH}
LIBOBJCARCH= ${NETBSDSRCDIR}/external/gpl3/gcc/lib/libobjc/arch/${MACHINE_ARCH}
GCCLIBXX= ${NETBSDSRCDIR}/external/gpl3/gcc/lib/libstdc++-v3/arch/${MACHINE_ARCH}
SRCS= ${G_OBJS:N[A-Z]*:Nlinking.lo:.lo=.c} ${G_OBJS:M[A-Z]*:.lo=.m} linking.m
@ -40,7 +40,7 @@ CPPFLAGS+= -I. -I${.CURDIR}/arch/${MACHINE_ARCH}
CPPFLAGS+= -I${GCCARCH} ${GCPPFLAGS:M-D*} ${GCPPFLAGS:M-I*:N-I.*}
CPPFLAGS+= -I${GCCLIBXX}
BUILDSYMLINKS= ${.CURDIR}/../libstdc++-v3_4/arch/${MACHINE_ARCH} bits
BUILDSYMLINKS= ${.CURDIR}/../libstdc++-v3/arch/${MACHINE_ARCH} bits
DPSRCS+= bits
.for f in Protocol.m Object.m NXConstStr.m linking.m
@ -113,3 +113,6 @@ CLEANFILES+= options.h optionlist
.else
.include <bsd.prog.mk> # do nothing
.endif
COPTS.archive.c+= -Wno-error
COPTS.sendmsg.c+= -Wno-error

4
external/gpl3/gcc/lib/libstdc++-v3/include/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1 2011/06/21 06:02:27 mrg Exp $
# $NetBSD: Makefile,v 1.2 2011/06/23 11:47:12 mrg Exp $
SUBDIR= backward ext bits debug tr1
#SUBDIR+= pb_assoc
@ -9,7 +9,7 @@ SUBDIR= backward ext bits debug tr1
.cc: # disable .cc->NULL transform
DIST= ${NETBSDSRCDIR}/gnu/dist/gcc4
DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
INCS= exception new typeinfo cxxabi.h exception_defines.h
INCS+= ${G_std_headers_rename} ${G_c_base_headers_rename}

4
external/gpl3/gcc/lib/libstdc++-v3/include/backward/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1 2011/06/21 06:02:27 mrg Exp $
# $NetBSD: Makefile,v 1.2 2011/06/23 11:47:12 mrg Exp $
.include <bsd.own.mk>
@ -6,7 +6,7 @@
.cc: # disable .cc->NULL transform
DIST= ${NETBSDSRCDIR}/gnu/dist/gcc4
DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
INCS= ${G_backward_headers}
INCSDIR= /usr/include/g++/backward

4
external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1 2011/06/21 06:02:27 mrg Exp $
# $NetBSD: Makefile,v 1.2 2011/06/23 11:47:12 mrg Exp $
.include <bsd.own.mk>
@ -6,7 +6,7 @@
.cc: # disable .cc->NULL transform
DIST= ${NETBSDSRCDIR}/gnu/dist/gcc4
DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
CONF= ${DIST}/libstdc++-v3/config
INCS= ${G_bits_headers} ${G_c_base_headers_extra} ${G_thread_host_headers} ${G_host_headers_extra} ${G_host_headers}

4
external/gpl3/gcc/lib/libstdc++-v3/include/debug/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1 2011/06/21 06:02:27 mrg Exp $
# $NetBSD: Makefile,v 1.2 2011/06/23 11:47:13 mrg Exp $
.include <bsd.own.mk>
@ -6,7 +6,7 @@
.cc: # disable .cc->NULL transform
DIST= ${NETBSDSRCDIR}/gnu/dist/gcc4
DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
INCS= ${G_debug_headers}
INCSDIR= /usr/include/g++/debug

4
external/gpl3/gcc/lib/libstdc++-v3/include/ext/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1 2011/06/21 06:02:27 mrg Exp $
# $NetBSD: Makefile,v 1.2 2011/06/23 11:47:13 mrg Exp $
.include <bsd.own.mk>
@ -6,7 +6,7 @@
.cc: # disable .cc->NULL transform
DIST= ${NETBSDSRCDIR}/gnu/dist/gcc4
DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
INCS= ${G_ext_headers}
INCSDIR= /usr/include/g++/ext

4
external/gpl3/gcc/lib/libstdc++-v3/include/tr1/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1 2011/06/21 06:02:28 mrg Exp $
# $NetBSD: Makefile,v 1.2 2011/06/23 11:47:13 mrg Exp $
.include <bsd.own.mk>
@ -6,7 +6,7 @@
.cc: # disable .cc->NULL transform
DIST= ${NETBSDSRCDIR}/gnu/dist/gcc4
DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
INCS= ${G_tr1_headers}
INCSDIR= /usr/include/g++/tr1

4
external/gpl3/gcc/lib/libsupc++/Makefile.common vendored
View File

@ -1,6 +1,6 @@
# $NetBSD: Makefile.common,v 1.1 2011/06/21 06:02:28 mrg Exp $
# $NetBSD: Makefile.common,v 1.2 2011/06/23 11:47:13 mrg Exp $
DIST= ${NETBSDSRCDIR}/gnu/dist/gcc4
DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
GNUHOSTDIST= ${DIST}
LIBMATHSRCS= ${G_libmath_la_SOURCES} ${G_libmath_la_LIBADD:.lo=.c}

6
external/gpl3/gcc/usr.bin/Makefile.inc vendored
View File

@ -1,9 +1,9 @@
# $NetBSD: Makefile.inc,v 1.1 2011/06/21 06:03:13 mrg Exp $
# $NetBSD: Makefile.inc,v 1.2 2011/06/23 11:47:13 mrg Exp $
.include <bsd.own.mk>
TOP= ${NETBSDSRCDIR}/gnu
DIST= ${TOP}/dist/gcc4
TOP= ${NETBSDSRCDIR}
DIST= ${TOP}/external/gpl3/gcc/dist
GCCARCH= ${.CURDIR}/../arch/${MACHINE_ARCH}