Module Name: src
Committed By: mrg
Date: Wed Feb 26 02:51:02 UTC 2014
Modified Files:
src/share/mk: bsd.lib.mk bsd.own.mk
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.345 -r1.346 src/share/mk/bsd.lib.mk
cvs rdiff -u -r1.767 -r1.768 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.lib.mk
diff -u src/share/mk/bsd.lib.mk:1.345 src/share/mk/bsd.lib.mk:1.346
--- src/share/mk/bsd.lib.mk:1.345 Tue Jan 14 11:31:01 2014
+++ src/share/mk/bsd.lib.mk Wed Feb 26 02:51:02 2014
@@ -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
.include <bsd.init.mk>
@@ -602,7 +602,7 @@ LIBDPLIBS+= c++ ${.CURDIR}/../../../
. elif defined(HAVE_GCC) && ${HAVE_GCC} == 4
LIBDPLIBS+= stdc++ ${.CURDIR}/../../../../../gnu/lib/libstdc++-v3_4
. else
-LIBDPLIBS+= stdc++ ${.CURDIR}/../../../../../external/gpl3/gcc/lib/libstdc++-v3
+LIBDPLIBS+= stdc++ ${.CURDIR}/../../../../../external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib/libstdc++-v3
. endif
.else
LIBCC:= ${CC}
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.767 src/share/mk/bsd.own.mk:1.768
--- src/share/mk/bsd.own.mk:1.767 Mon Feb 24 07:23:41 2014
+++ src/share/mk/bsd.own.mk Wed Feb 26 02:51:02 2014
@@ -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
.if defined(BSD_MK_COMPAT_FILE)
@@ -58,6 +58,18 @@ HAVE_GCC?= 45
.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"
USE_COMPILERCRTSTUFF?= yes
