port over 3 changes made here in the GCC 4.5 tree that we'll need
when GCC 4.8 becomes "gcc.old" eventually. this tree still needs to be tested for more, but this should be the bulk of the work. ---- Log Message: prepare for moving GCC 4.5 into gcc.old: - convert to using ${EXTERNAL_GCC_SUBDIR} - define base-external-gpl3-gcc* subdir as GCC_SUBDIR - use <bsd.init.mk> over <bsd.own.mk> for a bunch of places; mostly because it arranges for ../Makefile.inc to be included earlier, and don't bother including the latter if the former is already included. - move all .PATH: settings after <bsd.{own,lib}.mk> so that all valid variables are set before it is evaluated - rename mknative-gcc* to match their subdir name. XXX the relationship between the Makefile.inc/Makefile.gcc_path files is kind of sketchy, it would be great if this was fixed. ---- Log Message: oops, avoid re-setting DIST to something that might be wrong now. ---- Log Message: fix another dated DIST.
This commit is contained in:
parent
2e317a68f7
commit
5beaf704be
11
external/gpl3/gcc/lib/Makefile.inc
vendored
11
external/gpl3/gcc/lib/Makefile.inc
vendored
@ -1,3 +1,12 @@
|
||||
# $NetBSD: Makefile.inc,v 1.2 2014/03/01 10:00:31 mrg Exp $
|
||||
# $NetBSD: Makefile.inc,v 1.3 2014/06/01 19:51:01 mrg Exp $
|
||||
|
||||
GCC_MACHINE_ARCH=${MACHINE_ARCH:S/earmv5/earm/}
|
||||
|
||||
.ifndef _EXTERNAL_GPL3_GCC_LIB_MAKEFILE_INC_
|
||||
_EXTERNAL_GPL3_GCC_LIB_MAKEFILE_INC_=1
|
||||
|
||||
.sinclude "../../Makefile.gcc_path"
|
||||
.sinclude "../../../Makefile.gcc_path"
|
||||
.sinclude "../../../../Makefile.gcc_path"
|
||||
|
||||
.endif
|
||||
|
8
external/gpl3/gcc/lib/crtstuff/Makefile
vendored
8
external/gpl3/gcc/lib/crtstuff/Makefile
vendored
@ -1,18 +1,18 @@
|
||||
# $NetBSD: Makefile,v 1.12 2014/03/09 20:59:14 mrg Exp $
|
||||
# $NetBSD: Makefile,v 1.13 2014/06/01 19:51:01 mrg Exp $
|
||||
|
||||
REQUIRETOOLS= yes
|
||||
NOLINT= # defined
|
||||
UNSUPPORTED_COMPILER.clang= # defined
|
||||
|
||||
.include <bsd.own.mk>
|
||||
.include <bsd.init.mk>
|
||||
|
||||
# If using an external toolchain, we expect crtbegin/crtend to be
|
||||
# supplied by that toolchain's run-time support.
|
||||
.if !defined(EXTERNAL_TOOLCHAIN) && ${MKGCC} != "no"
|
||||
|
||||
DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
|
||||
DIST= ${GCCDIST}
|
||||
GNUHOSTDIST= ${DIST}
|
||||
GCCARCH= ${NETBSDSRCDIR}/external/gpl3/gcc/usr.bin/gcc/arch/${MACHINE_ARCH}
|
||||
GCCARCH= ${EXTERNAL_GCC_SUBDIR}/usr.bin/gcc/arch/${MACHINE_ARCH}
|
||||
|
||||
GALLCFLAGS= ${G_CRTSTUFF_CFLAGS} ${G_CRTSTUFF_T_CFLAGS}
|
||||
|
||||
|
10
external/gpl3/gcc/lib/libgcc/Makefile.inc
vendored
10
external/gpl3/gcc/lib/libgcc/Makefile.inc
vendored
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile.inc,v 1.27 2014/05/15 14:37:08 joerg Exp $
|
||||
# $NetBSD: Makefile.inc,v 1.28 2014/06/01 19:51:01 mrg Exp $
|
||||
|
||||
LIBGCC_MACHINE_ARCH?=${MACHINE_ARCH:S/earmv5/earm/}
|
||||
|
||||
@ -10,11 +10,11 @@ LIBGCC_MACHINE_ARCH?=${MACHINE_ARCH:S/earmv5/earm/}
|
||||
|
||||
UNSUPPORTED_COMPILER.clang= # defined
|
||||
|
||||
DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
|
||||
DIST= ${GCCDIST}
|
||||
GNUHOSTDIST= ${DIST}
|
||||
GCCARCH= ${NETBSDSRCDIR}/external/gpl3/gcc/usr.bin/gcc/arch/${LIBGCC_MACHINE_ARCH}
|
||||
GCCARCHLIBGCC= ${NETBSDSRCDIR}/external/gpl3/gcc/lib/libgcc/arch/${LIBGCC_MACHINE_ARCH}
|
||||
GCCARCHXX= ${NETBSDSRCDIR}/external/gpl3/gcc/lib/libstdc++-v3/arch/${LIBGCC_MACHINE_ARCH}
|
||||
GCCARCH= ${GCC_SUBDIR}/usr.bin/gcc/arch/${LIBGCC_MACHINE_ARCH}
|
||||
GCCARCHLIBGCC= ${GCC_SUBDIR}/lib/libgcc/arch/${LIBGCC_MACHINE_ARCH}
|
||||
GCCARCHXX= ${GCC_SUBDIR}/lib/libstdc++-v3/arch/${LIBGCC_MACHINE_ARCH}
|
||||
|
||||
GCPPFLAGS= ${G_LIBGCC2_CFLAGS} ${G_USE_COLLECT2} ${G_INCLUDES}
|
||||
CPPFLAGS+= -I${.CURDIR} -I${GCCARCHLIBGCC}
|
||||
|
3
external/gpl3/gcc/lib/libgcc/libgcc/Makefile
vendored
3
external/gpl3/gcc/lib/libgcc/libgcc/Makefile
vendored
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.21 2014/03/01 10:00:36 mrg Exp $
|
||||
# $NetBSD: Makefile,v 1.22 2014/06/01 19:51:01 mrg Exp $
|
||||
|
||||
REQUIRETOOLS= yes
|
||||
NOLINT= # defined
|
||||
@ -7,6 +7,7 @@ NOPROFILE= # defined
|
||||
|
||||
LIB= gcc
|
||||
|
||||
.include "../../../Makefile.gcc_path"
|
||||
.include <bsd.own.mk>
|
||||
|
||||
.if ${MKGCC} != "no"
|
||||
|
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.9 2014/03/21 20:54:13 joerg Exp $
|
||||
# $NetBSD: Makefile,v 1.10 2014/06/01 19:51:01 mrg Exp $
|
||||
|
||||
REQUIRETOOLS= yes
|
||||
NOLINT= # defined
|
||||
@ -7,6 +7,7 @@ NOPROFILE= # defined
|
||||
|
||||
LIB= gcc_eh
|
||||
|
||||
.include "../../../Makefile.gcc_path"
|
||||
.include <bsd.own.mk>
|
||||
|
||||
.if ${MKGCC} != "no"
|
||||
|
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.9 2014/03/05 21:38:59 tron Exp $
|
||||
# $NetBSD: Makefile,v 1.10 2014/06/01 19:51:01 mrg Exp $
|
||||
|
||||
USE_SHLIBDIR= yes
|
||||
REQUIRETOOLS= yes
|
||||
@ -9,6 +9,7 @@ NOSTATICLIB= # defined
|
||||
NOPROFILE= # defined
|
||||
NOPICINSTALL= # defined
|
||||
|
||||
.include "../../../Makefile.gcc_path"
|
||||
.include <bsd.own.mk>
|
||||
|
||||
.if ${MKGCC} != "no"
|
||||
|
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.7 2014/03/01 10:00:36 mrg Exp $
|
||||
# $NetBSD: Makefile,v 1.8 2014/06/01 19:51:01 mrg Exp $
|
||||
|
||||
REQUIRETOOLS= yes
|
||||
NOPIC= # defined
|
||||
@ -7,6 +7,7 @@ NOLINT= # defined
|
||||
|
||||
LIB= gcov
|
||||
|
||||
.include "../../../Makefile.gcc_path"
|
||||
.include <bsd.own.mk>
|
||||
.include <bsd.init.mk>
|
||||
|
||||
|
10
external/gpl3/gcc/lib/libgomp/Makefile
vendored
10
external/gpl3/gcc/lib/libgomp/Makefile
vendored
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.11 2014/03/01 10:00:38 mrg Exp $
|
||||
# $NetBSD: Makefile,v 1.12 2014/06/01 19:51:01 mrg Exp $
|
||||
|
||||
# build GCC's libgomp, so that -fopenmp works.
|
||||
|
||||
@ -9,7 +9,7 @@ NOLINT= # defined
|
||||
|
||||
.if !defined(NO_LIBGOMP) # {
|
||||
|
||||
DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
|
||||
DIST= ${GCCDIST}
|
||||
|
||||
LIB= gomp
|
||||
SRCS= \
|
||||
@ -50,6 +50,8 @@ CPPFLAGS+= \
|
||||
-I${ARCHDIR}
|
||||
CFLAGS+=-pthread
|
||||
|
||||
COPTS+= -Wno-stack-protector
|
||||
|
||||
CWARNFLAGS.clang+= -Wno-conversion
|
||||
|
||||
# libgomp is 1.0 is in GCC 4.5, and 1.1 in 4.8 since it added more symbols
|
||||
@ -58,8 +60,6 @@ SHLIB_MINOR= 1
|
||||
|
||||
LDFLAGS+= -Wl,--version-script,${DIST}/libgomp/libgomp.map
|
||||
|
||||
.PATH: ${ARCHDIR} ${DIST}/libgomp ${DIST}/libgomp/config/posix
|
||||
|
||||
.if ${GOMP_MACHINE_ARCH} == ${MACHINE_ARCH:S/earmv5/earm/}
|
||||
# This is where GCC looks for it.
|
||||
FILES= libgomp.spec
|
||||
@ -75,4 +75,4 @@ libinstall::
|
||||
|
||||
.include <bsd.lib.mk>
|
||||
|
||||
COPTS+= -Wno-stack-protector
|
||||
.PATH: ${ARCHDIR} ${DIST}/libgomp ${DIST}/libgomp/config/posix
|
||||
|
6
external/gpl3/gcc/lib/libiberty/Makefile
vendored
6
external/gpl3/gcc/lib/libiberty/Makefile
vendored
@ -1,8 +1,8 @@
|
||||
# $NetBSD: Makefile,v 1.6 2014/03/01 10:00:40 mrg Exp $
|
||||
# $NetBSD: Makefile,v 1.7 2014/06/01 19:51:01 mrg Exp $
|
||||
|
||||
LIBISPRIVATE= yes
|
||||
|
||||
.include <bsd.own.mk>
|
||||
.include <bsd.init.mk>
|
||||
|
||||
GCC_MACHINE_ARCH?=${MACHINE_ARCH:S/earmv5/earm/}
|
||||
|
||||
@ -10,7 +10,7 @@ LIB= iberty
|
||||
|
||||
.include "${.CURDIR}/defs.mk"
|
||||
|
||||
DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
|
||||
DIST= ${GCCDIST}
|
||||
GNUHOSTDIST= ${DIST}
|
||||
|
||||
SRCS= ${G_REQUIRED_OFILES:.o=.c} ${G_EXTRA_OFILES:.o=.c} \
|
||||
|
10
external/gpl3/gcc/lib/libmudflap/Makefile
vendored
10
external/gpl3/gcc/lib/libmudflap/Makefile
vendored
@ -1,16 +1,14 @@
|
||||
# $NetBSD: Makefile,v 1.4 2014/03/01 10:00:42 mrg Exp $
|
||||
# $NetBSD: Makefile,v 1.5 2014/06/01 19:51:01 mrg Exp $
|
||||
|
||||
NOLINT=yes # core dumps
|
||||
UNSUPPORTED_COMPILER.clang= # defined
|
||||
|
||||
.include <bsd.own.mk>
|
||||
.include <bsd.init.mk>
|
||||
|
||||
DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist/libmudflap
|
||||
DIST= ${GCCDIST}/libmudflap
|
||||
CPPFLAGS+= -I${.CURDIR}
|
||||
LINTFLAGS+=-g
|
||||
|
||||
.PATH: ${DIST}
|
||||
|
||||
SHLIB_MAJOR= 0
|
||||
SHLIB_MINOR= 0
|
||||
|
||||
@ -20,3 +18,5 @@ INCS=mf-runtime.h
|
||||
INCSDIR=/usr/include/gcc-4.8
|
||||
|
||||
.include <bsd.lib.mk>
|
||||
|
||||
.PATH: ${DIST}
|
||||
|
10
external/gpl3/gcc/lib/libmudflapth/Makefile
vendored
10
external/gpl3/gcc/lib/libmudflapth/Makefile
vendored
@ -1,15 +1,13 @@
|
||||
# $NetBSD: Makefile,v 1.4 2014/03/01 10:00:42 mrg Exp $
|
||||
# $NetBSD: Makefile,v 1.5 2014/06/01 19:51:01 mrg Exp $
|
||||
|
||||
NOLINT=yes # core dumps
|
||||
UNSUPPORTED_COMPILER.clang= # defined
|
||||
|
||||
.include <bsd.own.mk>
|
||||
.include <bsd.init.mk>
|
||||
|
||||
DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist/libmudflap
|
||||
DIST= ${GCCDIST}/libmudflap
|
||||
CPPFLAGS+= -I${.CURDIR}/../libmudflap -DLIBMUDFLAPTH
|
||||
|
||||
.PATH: ${DIST}
|
||||
|
||||
SHLIB_MAJOR= 0
|
||||
SHLIB_MINOR= 0
|
||||
|
||||
@ -18,3 +16,5 @@ LIB=mudflapth
|
||||
SRCS=mf-runtime.c mf-heuristics.c mf-hooks1.c mf-hooks2.c mf-hooks3.c
|
||||
|
||||
.include <bsd.lib.mk>
|
||||
|
||||
.PATH: ${DIST}
|
||||
|
18
external/gpl3/gcc/lib/libobjc/Makefile
vendored
18
external/gpl3/gcc/lib/libobjc/Makefile
vendored
@ -1,11 +1,11 @@
|
||||
# $NetBSD: Makefile,v 1.12 2014/05/15 14:37:08 joerg Exp $
|
||||
# $NetBSD: Makefile,v 1.13 2014/06/01 19:51:01 mrg Exp $
|
||||
|
||||
REQUIRETOOLS= yes
|
||||
NOLINT= # defined
|
||||
|
||||
UNSUPPORTED_COMPILER.clang= # defined
|
||||
|
||||
.include <bsd.own.mk>
|
||||
.include <bsd.init.mk>
|
||||
|
||||
LIB= objc
|
||||
GCC_MACHINE_ARCH?= ${MACHINE_ARCH:S/earmv5/earm/}
|
||||
@ -28,11 +28,11 @@ EXTRA_FAKEHEADERS=
|
||||
|
||||
LIBGCCOBJ!= cd ${.CURDIR}/../libgcc/libgcc && ${PRINTOBJDIR}
|
||||
|
||||
DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
|
||||
GNUHOSTDIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
|
||||
GCCARCH= ${NETBSDSRCDIR}/external/gpl3/gcc/usr.bin/gcc/arch/${GCC_MACHINE_ARCH}
|
||||
LIBOBJCARCH= ${NETBSDSRCDIR}/external/gpl3/gcc/lib/libobjc/arch/${GCC_MACHINE_ARCH}
|
||||
GCCLIBXX= ${NETBSDSRCDIR}/external/gpl3/gcc/lib/libstdc++-v3/arch/${GCC_MACHINE_ARCH}
|
||||
DIST= ${GCCDIST}
|
||||
GNUHOSTDIST= ${DIST}
|
||||
GCCARCH= ${GCC_SUBDIR}/usr.bin/gcc/arch/${GCC_MACHINE_ARCH}
|
||||
LIBOBJCARCH= ${GCC_SUBDIR}/lib/libobjc/arch/${GCC_MACHINE_ARCH}
|
||||
GCCLIBXX= ${GCC_SUBDIR}/lib/libstdc++-v3/arch/${GCC_MACHINE_ARCH}
|
||||
|
||||
SRCS= ${G_OBJC_SOURCE_FILES} ${G_C_SOURCE_FILES}
|
||||
|
||||
@ -70,8 +70,6 @@ runtime-info.h:
|
||||
touch rtscratch
|
||||
`${OBJC} --print-prog-name=cc1obj` -print-objc-runtime-info rtscratch >$@
|
||||
|
||||
.PATH: ${DIST}/libobjc ${DIST}/libobjc/objc ${DIST}/libobjc/objc-private
|
||||
|
||||
${OBJS} ${POBJS} ${SOBJS}: runtime-info.h
|
||||
|
||||
${SRCS}: tconfig.h options.h
|
||||
@ -115,6 +113,8 @@ CLEANFILES+= options.h optionlist
|
||||
|
||||
.include <bsd.lib.mk>
|
||||
|
||||
.PATH: ${DIST}/libobjc ${DIST}/libobjc/objc ${DIST}/libobjc/objc-private
|
||||
|
||||
.else
|
||||
.include <bsd.prog.mk> # do nothing
|
||||
.endif
|
||||
|
4
external/gpl3/gcc/lib/libstdc++-v3/Makefile
vendored
4
external/gpl3/gcc/lib/libstdc++-v3/Makefile
vendored
@ -1,9 +1,9 @@
|
||||
# $NetBSD: Makefile,v 1.14 2014/05/31 20:09:15 christos Exp $
|
||||
# $NetBSD: Makefile,v 1.15 2014/06/01 19:51:01 mrg Exp $
|
||||
|
||||
REQUIRETOOLS= yes
|
||||
NOLINT= # defined
|
||||
|
||||
.include <bsd.own.mk>
|
||||
.include <bsd.init.mk>
|
||||
|
||||
.include "Makefile.inc"
|
||||
|
||||
|
11
external/gpl3/gcc/lib/libstdc++-v3/Makefile.inc
vendored
11
external/gpl3/gcc/lib/libstdc++-v3/Makefile.inc
vendored
@ -1,3 +1,12 @@
|
||||
# $NetBSD: Makefile.inc,v 1.3 2014/03/01 10:00:45 mrg Exp $
|
||||
# $NetBSD: Makefile.inc,v 1.4 2014/06/01 19:51:01 mrg Exp $
|
||||
|
||||
.ifndef _EXTERNAL_GPL3_GCC_LIB_LIBSTDCXX_MAKEFILE_INC_
|
||||
_EXTERNAL_GPL3_GCC_LIB_LIBSTDCXX_MAKEFILE_INC_=1
|
||||
|
||||
GCC_MACHINE_ARCH=${MACHINE_ARCH:S/earmv5/earm/}
|
||||
|
||||
.include "../../Makefile.inc"
|
||||
.sinclude "../../../Makefile.gcc_path"
|
||||
.sinclude "../../../../Makefile.gcc_path"
|
||||
|
||||
.endif
|
||||
|
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.8 2014/03/01 10:00:47 mrg Exp $
|
||||
# $NetBSD: Makefile,v 1.9 2014/06/01 19:51:01 mrg Exp $
|
||||
|
||||
SUBDIR= backward ext bits debug decimal parallel pb profile
|
||||
SUBDIR+= tr1 tr2
|
||||
@ -10,7 +10,7 @@ SUBDIR+= tr1 tr2
|
||||
|
||||
.cc: # disable .cc->NULL transform
|
||||
|
||||
DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
|
||||
DIST= ${GCCDIST}
|
||||
GNUHOSTDIST= ${DIST}
|
||||
|
||||
# libsupc++
|
||||
|
@ -1,3 +1,11 @@
|
||||
# $NetBSD: Makefile.inc,v 1.3 2014/03/01 10:00:47 mrg Exp $
|
||||
# $NetBSD: Makefile.inc,v 1.4 2014/06/01 19:51:01 mrg Exp $
|
||||
|
||||
.ifndef _EXTERNAL_GPL3_GCC_LIB_LIBSTDCXX_INCLUDE_MAKEFILE_INC_
|
||||
_EXTERNAL_GPL3_GCC_LIB_LIBSTDCXX_INCLUDE_MAKEFILE_INC_=1
|
||||
|
||||
.include "../Makefile.inc"
|
||||
.include "../../../Makefile.gcc_path"
|
||||
|
||||
DIST=${GCCDIST}
|
||||
|
||||
.endif
|
||||
|
@ -1,20 +1,17 @@
|
||||
# $NetBSD: Makefile,v 1.5 2014/03/01 10:00:47 mrg Exp $
|
||||
# $NetBSD: Makefile,v 1.6 2014/06/01 19:51:02 mrg Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
.include <bsd.init.mk>
|
||||
|
||||
.include "${.CURDIR}/../../arch/${GCC_MACHINE_ARCH}/defs.mk"
|
||||
|
||||
.cc: # disable .cc->NULL transform
|
||||
|
||||
DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
|
||||
|
||||
INCS= ${G_backward_headers}
|
||||
INCSDIR= /usr/include/g++/backward
|
||||
|
||||
.include "${.CURDIR}/../Makefile.includes"
|
||||
|
||||
.PATH: ${DIST}/libstdc++-v3/include
|
||||
|
||||
# Get default targets including <bsd.inc.mk>.
|
||||
.include <bsd.prog.mk>
|
||||
|
||||
.PATH: ${DIST}/libstdc++-v3/include
|
||||
|
@ -1,13 +1,11 @@
|
||||
# $NetBSD: Makefile,v 1.14 2014/03/13 16:14:27 gdt Exp $
|
||||
# $NetBSD: Makefile,v 1.15 2014/06/01 19:51:02 mrg Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
.include <bsd.init.mk>
|
||||
|
||||
.include "${.CURDIR}/../../arch/${GCC_MACHINE_ARCH}/defs.mk"
|
||||
|
||||
.cc: # disable .cc->NULL transform
|
||||
|
||||
DIST= ${NETBSDSRCDIR}/external/gpl3/${EXTERNAL_GCC_SUBDIR}/dist
|
||||
GNUHOSTDIST= ${DIST}
|
||||
|
||||
BUILDINCS= basic_file.h c++allocator.h c++io.h c++locale.h
|
||||
@ -55,12 +53,13 @@ ${_h}: ${_s}
|
||||
cp -pf ${.ALLSRC} ${.TARGET}
|
||||
.endfor
|
||||
|
||||
# Get default targets including <bsd.inc.mk>.
|
||||
.include <bsd.prog.mk>
|
||||
|
||||
.PATH: ${.CURDIR}/../../arch/${GCC_MACHINE_ARCH} \
|
||||
${DIST}/libstdc++-v3/include \
|
||||
${DIST}/libstdc++-v3/config \
|
||||
${DIST}/libstdc++-v3/ \
|
||||
${DIST}/libstdc++-v3/libsupc++
|
||||
|
||||
# Get default targets including <bsd.inc.mk>.
|
||||
.include <bsd.prog.mk>
|
||||
.include <bsd.subdir.mk>
|
||||
|
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.5 2014/03/01 10:00:48 mrg Exp $
|
||||
# $NetBSD: Makefile,v 1.6 2014/06/01 19:51:02 mrg Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
.include <bsd.init.mk>
|
||||
@ -7,14 +7,12 @@
|
||||
|
||||
.cc: # disable .cc->NULL transform
|
||||
|
||||
DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
|
||||
|
||||
INCS= ${G_debug_headers}
|
||||
INCSDIR= /usr/include/g++/debug
|
||||
|
||||
.include "${.CURDIR}/../Makefile.includes"
|
||||
|
||||
.PATH: ${DIST}/libstdc++-v3/include
|
||||
|
||||
# Get default targets including <bsd.inc.mk>.
|
||||
.include <bsd.prog.mk>
|
||||
|
||||
.PATH: ${DIST}/libstdc++-v3/include
|
||||
|
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.4 2014/03/01 10:00:48 mrg Exp $
|
||||
# $NetBSD: Makefile,v 1.5 2014/06/01 19:51:02 mrg Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
.include <bsd.init.mk>
|
||||
@ -7,14 +7,12 @@
|
||||
|
||||
.cc: # disable .cc->NULL transform
|
||||
|
||||
DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
|
||||
|
||||
INCS= ${G_decimal_headers}
|
||||
INCSDIR= /usr/include/g++/decimal
|
||||
|
||||
.include "${.CURDIR}/../Makefile.includes"
|
||||
|
||||
.PATH: ${DIST}/libstdc++-v3/include
|
||||
|
||||
# Get default targets including <bsd.inc.mk>.
|
||||
.include <bsd.prog.mk>
|
||||
|
||||
.PATH: ${DIST}/libstdc++-v3/include
|
||||
|
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.6 2014/03/01 10:00:48 mrg Exp $
|
||||
# $NetBSD: Makefile,v 1.7 2014/06/01 19:51:02 mrg Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
.include <bsd.init.mk>
|
||||
@ -7,19 +7,18 @@
|
||||
|
||||
.cc: # disable .cc->NULL transform
|
||||
|
||||
DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
|
||||
|
||||
INCS= ${G_ext_headers}
|
||||
|
||||
INCSDIR= /usr/include/g++/ext
|
||||
|
||||
.include "${.CURDIR}/../Makefile.includes"
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
# Get default targets including <bsd.inc.mk>.
|
||||
|
||||
.PATH: ${DIST}/libstdc++-v3/include/ext
|
||||
.PATH: ${DIST}/libstdc++-v3/include
|
||||
.PATH: ${DIST}/libstdc++-v3/config
|
||||
.PATH: ${DIST}/libstdc++-v3/libsupc++
|
||||
# for ext/hash_set
|
||||
#.PATH: ${DIST}/libstdc++-v3/include/backward
|
||||
|
||||
# Get default targets including <bsd.inc.mk>.
|
||||
.include <bsd.prog.mk>
|
||||
|
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.4 2014/03/01 10:00:48 mrg Exp $
|
||||
# $NetBSD: Makefile,v 1.5 2014/06/01 19:51:02 mrg Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
.include <bsd.init.mk>
|
||||
@ -7,14 +7,12 @@
|
||||
|
||||
.cc: # disable .cc->NULL transform
|
||||
|
||||
DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
|
||||
|
||||
INCS= ${G_parallel_headers}
|
||||
INCSDIR= /usr/include/g++/parallel
|
||||
|
||||
.include "${.CURDIR}/../Makefile.includes"
|
||||
|
||||
.PATH: ${DIST}/libstdc++-v3/include
|
||||
|
||||
# Get default targets including <bsd.inc.mk>.
|
||||
.include <bsd.prog.mk>
|
||||
|
||||
.PATH: ${DIST}/libstdc++-v3/include
|
||||
|
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.5 2014/03/01 10:00:48 mrg Exp $
|
||||
# $NetBSD: Makefile,v 1.6 2014/06/01 19:51:02 mrg Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
.include <bsd.init.mk>
|
||||
@ -7,14 +7,12 @@
|
||||
|
||||
.cc: # disable .cc->NULL transform
|
||||
|
||||
DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
|
||||
|
||||
INCS= ${G_tr1_headers}
|
||||
INCSDIR= /usr/include/g++/tr1
|
||||
|
||||
.include "${.CURDIR}/../Makefile.includes"
|
||||
|
||||
.PATH: ${DIST}/libstdc++-v3/include
|
||||
|
||||
# Get default targets including <bsd.inc.mk>.
|
||||
.include <bsd.prog.mk>
|
||||
|
||||
.PATH: ${DIST}/libstdc++-v3/include
|
||||
|
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.4 2014/03/01 10:00:48 mrg Exp $
|
||||
# $NetBSD: Makefile,v 1.5 2014/06/01 19:51:02 mrg Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
.include <bsd.init.mk>
|
||||
@ -7,12 +7,10 @@
|
||||
|
||||
.cc: # disable .cc->NULL transform
|
||||
|
||||
DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
|
||||
|
||||
INCS= ${G_tr1_impl_headers}
|
||||
INCSDIR= /usr/include/g++/tr1_impl
|
||||
|
||||
.PATH: ${DIST}/libstdc++-v3/include/tr1_impl
|
||||
|
||||
# Get default targets including <bsd.inc.mk>.
|
||||
.include <bsd.prog.mk>
|
||||
|
||||
.PATH: ${DIST}/libstdc++-v3/include/tr1_impl
|
||||
|
4
external/gpl3/gcc/lib/libsupc++/Makefile
vendored
4
external/gpl3/gcc/lib/libsupc++/Makefile
vendored
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.9 2014/05/28 17:09:18 mrg Exp $
|
||||
# $NetBSD: Makefile,v 1.10 2014/06/01 19:51:02 mrg Exp $
|
||||
|
||||
REQUIRETOOLS= yes
|
||||
NOLINT= # defined
|
||||
@ -8,7 +8,7 @@ NOPROFILE= # defined
|
||||
CWARNFLAGS.clang+= -Wno-parentheses
|
||||
UNSUPPORTED_COMPILER.clang= # defined
|
||||
|
||||
.include <bsd.own.mk>
|
||||
.include <bsd.init.mk>
|
||||
|
||||
GCC_MACHINE_ARCH?=${MACHINE_ARCH:S/earmv5/earm/}
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
# $NetBSD: Makefile.common,v 1.7 2014/05/28 17:09:18 mrg Exp $
|
||||
# $NetBSD: Makefile.common,v 1.8 2014/06/01 19:51:02 mrg Exp $
|
||||
|
||||
DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
|
||||
DIST= ${GCCDIST}
|
||||
GNUHOSTDIST= ${DIST}
|
||||
|
||||
GCC_MACHINE_ARCH=${MACHINE_ARCH:S/earmv5/earm/}
|
||||
|
6
external/gpl3/gcc/usr.bin/Makefile.inc
vendored
6
external/gpl3/gcc/usr.bin/Makefile.inc
vendored
@ -1,15 +1,17 @@
|
||||
# $NetBSD: Makefile.inc,v 1.23 2014/05/31 22:55:16 mrg Exp $
|
||||
# $NetBSD: Makefile.inc,v 1.24 2014/06/01 19:51:02 mrg Exp $
|
||||
|
||||
.ifndef _EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_INC_
|
||||
_EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_INC_=1
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
.sinclude "../../Makefile.gcc_path"
|
||||
|
||||
GCC_MACHINE_ARCH=${MACHINE_ARCH:S/earmv5/earm/}
|
||||
GMP_MACHINE_ARCH=${MACHINE_ARCH:C/armv[4-7]/arm/}
|
||||
|
||||
TOP= ${NETBSDSRCDIR}
|
||||
DIST= ${TOP}/external/gpl3/gcc/dist
|
||||
DIST= ${GCCDIST}
|
||||
|
||||
GCCARCH= ${.CURDIR}/../gcc/arch/${GCC_MACHINE_ARCH}
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
# $NetBSD: Makefile,v 1.5 2014/03/01 10:00:54 mrg Exp $
|
||||
# $NetBSD: Makefile,v 1.6 2014/06/01 19:51:02 mrg Exp $
|
||||
|
||||
DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
|
||||
DIST= ${GCCDIST}
|
||||
GNUHOSTDIST= ${DIST}
|
||||
|
||||
LIBISPRIVATE= yes
|
||||
|
Loading…
Reference in New Issue
Block a user