Module Name: src
Committed By: mrg
Date: Thu Jun 23 12:16:36 UTC 2011
Modified Files:
src/external/gpl3/gcc/lib/libstdc++-v3: Makefile
src/external/gpl3/gcc/lib/libsupc++: Makefile
Log Message:
fix some more paths for GCC 4.5.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gcc/lib/libstdc++-v3/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gcc/lib/libsupc++/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/lib/libstdc++-v3/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.1 src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.2
--- src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.1 Tue Jun 21 06:02:27 2011
+++ src/external/gpl3/gcc/lib/libstdc++-v3/Makefile Thu Jun 23 12:16:36 2011
@@ -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 12:16:36 mrg Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -8,7 +8,7 @@
LIB= stdc++
LDADD= -lgcc_s
-LIBDPLIBS+= m ${.CURDIR}/../../../lib/libm
+LIBDPLIBS+= m ${.CURDIR}/../../../../../lib/libm
CWARNFLAGS.clang+= -Wno-logical-op-parentheses \
-Wno-deprecated-writable-strings -Wno-parentheses
@@ -24,7 +24,7 @@
INCS= c++config.h
INCSDIR= /usr/include/g++
-.include "${.CURDIR}/../libsupc++4/Makefile.common"
+.include "${.CURDIR}/../libsupc++/Makefile.common"
SRCS= ${LIBMATHSRCS} ${LIBSUPCXXSRCS} ${LIBSTDCXXSRCS}
# affects profiling; can't switch it off just for profiling easily.
Index: src/external/gpl3/gcc/lib/libsupc++/Makefile
diff -u src/external/gpl3/gcc/lib/libsupc++/Makefile:1.1 src/external/gpl3/gcc/lib/libsupc++/Makefile:1.2
--- src/external/gpl3/gcc/lib/libsupc++/Makefile:1.1 Tue Jun 21 06:02:28 2011
+++ src/external/gpl3/gcc/lib/libsupc++/Makefile Thu Jun 23 12:16:36 2011
@@ -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 12:16:36 mrg Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -11,13 +11,13 @@
LIB= supc++
-.if exists(${.CURDIR}/../libstdc++-v3_4/arch/${MACHINE_ARCH}/defs.mk) && ${MKGCC} != "no"
-.include "${.CURDIR}/../libstdc++-v3_4/arch/${MACHINE_ARCH}/defs.mk"
+.if exists(${.CURDIR}/../libstdc++-v3/arch/${MACHINE_ARCH}/defs.mk) && ${MKGCC} != "no"
+.include "${.CURDIR}/../libstdc++-v3/arch/${MACHINE_ARCH}/defs.mk"
SHLIB_MAJOR= 1
SHLIB_MINOR= 0
-.include "${.CURDIR}/../libsupc++4/Makefile.common"
+.include "${.CURDIR}/../libsupc++/Makefile.common"
SRCS= ${LIBSUPCXXSRCS} xmalloc.c
CXXFLAGS+= ${G_SECTION_FLAGS}
@@ -37,9 +37,9 @@
${DIST}/libstdc++-v3/libmath \
${DIST}/libstdc++-v3/libsupc++ \
${DIST}/libiberty \
- ${.CURDIR}/../libstdc++-v3_4/arch/${MACHINE_ARCH}
+ ${.CURDIR}/../libstdc++-v3/arch/${MACHINE_ARCH}
-${OBJS}: ${.CURDIR}/../libstdc++-v3_4/arch/${MACHINE_ARCH}/defs.mk
+${OBJS}: ${.CURDIR}/../libstdc++-v3/arch/${MACHINE_ARCH}/defs.mk
.else
.include <bsd.prog.mk> # do nothing
.endif
