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

define EXTERNAL_GCC_SUBDIR based upon HAVE_GCC, for GCC >= 4.5, 

and use it in the one place (bsd.lib.mk) it's used in share/mk.
This commit is contained in:
mrg 2014-02-26 02:51:02 +00:00
parent 711a488a45
commit e849bbac94
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
share/mk/bsd.lib.mk
View File

@ -1,4 +1,4 @@
# $NetBSD: bsd.lib.mk,v 1.345 2014/01/14 11:31:01 apb Exp $ # $NetBSD: bsd.lib.mk,v 1.346 2014/02/26 02:51:02 mrg Exp $
# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94 # @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
.include <bsd.init.mk> .include <bsd.init.mk>
@ -602,7 +602,7 @@ LIBDPLIBS+= c++ ${.CURDIR}/../../../../../external/bsd/libc++/lib
. elif defined(HAVE_GCC) && ${HAVE_GCC} == 4 . elif defined(HAVE_GCC) && ${HAVE_GCC} == 4
LIBDPLIBS+= stdc++ ${.CURDIR}/../../../../../gnu/lib/libstdc++-v3_4 LIBDPLIBS+= stdc++ ${.CURDIR}/../../../../../gnu/lib/libstdc++-v3_4
. else . else
LIBDPLIBS+= stdc++ ${.CURDIR}/../../../../../external/gpl3/gcc/lib/libstdc++-v3 LIBDPLIBS+= stdc++ ${.CURDIR}/../../../../../external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib/libstdc++-v3
. endif . endif
.else .else
LIBCC:= ${CC} LIBCC:= ${CC}

14
share/mk/bsd.own.mk
View File

@ -1,4 +1,4 @@
# $NetBSD: bsd.own.mk,v 1.767 2014/02/24 07:23:41 skrll Exp $ # $NetBSD: bsd.own.mk,v 1.768 2014/02/26 02:51:02 mrg Exp $
# This needs to be before bsd.init.mk # This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE) .if defined(BSD_MK_COMPAT_FILE)
@ -58,6 +58,18 @@ HAVE_GCC?= 45
.endif .endif
.endif .endif
#
# We import the old gcc as "gcc.old" when upgrading. EXTERNAL_GCC_SUBDIR is
# set to the relevant subdirectory in src/external/gpl3 for his HAVE_GCC.
#
.if ${HAVE_GCC} == 45
EXTERNAL_GCC_SUBDIR= gcc.old
EXTERNAL_GCC_SUBDIR= gcc
.elif ${HAVE_GCC} == 48
EXTERNAL_GCC_SUBDIR= gcc
.else
EXTERNAL_GCC_SUBDIR= /does/not/exist
.endif
.if ${MACHINE_ARCH} == "ia64" .if ${MACHINE_ARCH} == "ia64"
USE_COMPILERCRTSTUFF?= yes USE_COMPILERCRTSTUFF?= yes