diff options
| -rw-r--r-- | gnu/lib/libstdc++-v3/Makefile | 27 | ||||
| -rw-r--r-- | gnu/lib/libstdc++-v3/Makefile.common | 34 |
2 files changed, 37 insertions, 24 deletions
diff --git a/gnu/lib/libstdc++-v3/Makefile b/gnu/lib/libstdc++-v3/Makefile index 9fd3267ebd9..e70d0da2e91 100644 --- a/gnu/lib/libstdc++-v3/Makefile +++ b/gnu/lib/libstdc++-v3/Makefile @@ -1,17 +1,10 @@ # $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.63.2.1 2009/08/03 08:13:06 kensmith Exp $ -# $OpenBSD: Makefile,v 1.5 2010/05/09 11:39:59 espie Exp $ +# $OpenBSD: Makefile,v 1.6 2010/05/15 08:21:03 robert Exp $ -GCCDIR= ${.CURDIR}/../../gcc/gcc -GCCLIB= ${GCCDIR}/gcc -SRCDIR= ${.CURDIR}/../../gcc/libstdc++-v3 -SUPDIR= ${SRCDIR}/libsupc++ +.include "${.CURDIR}/Makefile.common" GCC_TARGET= ${MACHINE_ARCH}-unknown-openbsd${OSREV} -.PATH: ${SRCDIR}/src ${SRCDIR}/libmath ${SRCDIR}/config/io \ - ${SRCDIR}/config/locale/generic \ - ${SRCDIR}/include ${SUPDIR} ${.CURDIR}/../libiberty/src - LIB= stdc++ CFLAGS+= -DIN_GLIBCPP_V3 -DHAVE_CONFIG_H @@ -56,15 +49,7 @@ SRCS+= basic_file_stdio.cc c_locale.cc SRCS+= stubs.c # Embedded copy of libsupc++ -SRCS+= del_op.cc del_opnt.cc del_opv.cc del_opvnt.cc eh_alloc.cc eh_arm.cc \ - eh_aux_runtime.cc eh_call.cc eh_catch.cc eh_exception.cc eh_globals.cc \ - eh_personality.cc eh_term_handler.cc eh_terminate.cc eh_throw.cc \ - eh_type.cc eh_unex_handler.cc guard.cc new_handler.cc new_op.cc \ - new_opnt.cc new_opv.cc new_opvnt.cc pure.cc tinfo.cc tinfo2.cc \ - vec.cc vterminate.cc - -# from libiberty: -SRCS+= cp-demangle.c +SRCS+= ${SUPSRCS} # MD headers location .if ${MACHINE_ARCH} == "sparc64" @@ -599,12 +584,6 @@ gthr-default.h: ${GCCDIR}/gthr-posix.h CLEANFILES+= ${THRHDRS} -unwind.h: ${GCCDIR}/unwind-generic.h - ln -sf ${.ALLSRC} ${.TARGET} - -SRCS+= unwind.h -CLEANFILES+= unwind.h - DATESTAMP!= cat ${GCCDIR}/DATESTAMP c++config.h: ${.CURDIR}/config.h ${SRCDIR}/include/bits/c++config diff --git a/gnu/lib/libstdc++-v3/Makefile.common b/gnu/lib/libstdc++-v3/Makefile.common new file mode 100644 index 00000000000..a492afd513a --- /dev/null +++ b/gnu/lib/libstdc++-v3/Makefile.common @@ -0,0 +1,34 @@ +# $OpenBSD: Makefile.common,v 1.1 2010/05/15 08:21:03 robert Exp $ + +GCCDIR= ${.CURDIR}/../../gcc/gcc +GCCLIB= ${GCCDIR}/gcc +SRCDIR= ${.CURDIR}/../../gcc/libstdc++-v3 +SUPDIR= ${SRCDIR}/libsupc++ + +.PATH: ${SRCDIR}/src ${SRCDIR}/libmath ${SRCDIR}/config/io \ + ${SRCDIR}/config/locale/generic \ + ${SRCDIR}/include ${SUPDIR} ${.CURDIR}/../libiberty/src \ + ${.CURDIR}/../libstdc++-v3/obj + +CFLAGS+= -DIN_GLIBCPP_V3 -DHAVE_CONFIG_H +CFLAGS+= -I${.CURDIR}/../libstdc++-v3/ -I${SUPDIR} -I${GCCDIR} -I${SRCDIR}/include +CFLAGS+= -I${GCCLIB}/include -I${SRCDIR}/include -I${.CURDIR}/../libiberty/include -I. +CFLAGS+= -frandom-seed=RepeatabilityConsideredGood +CXXFLAGS+= -fno-implicit-templates -ffunction-sections -fdata-sections \ + -Wno-deprecated + +SUPSRCS=del_op.cc del_opnt.cc del_opv.cc del_opvnt.cc eh_alloc.cc eh_arm.cc \ + eh_aux_runtime.cc eh_call.cc eh_catch.cc eh_exception.cc eh_globals.cc \ + eh_personality.cc eh_term_handler.cc eh_terminate.cc eh_throw.cc \ + eh_type.cc eh_unex_handler.cc guard.cc new_handler.cc new_op.cc \ + new_opnt.cc new_opv.cc new_opvnt.cc pure.cc tinfo.cc tinfo2.cc \ + vec.cc vterminate.cc + +# from libiberty: +SRCS+= cp-demangle.c + +unwind.h: ${GCCDIR}/unwind-generic.h + ln -sf ${.ALLSRC} ${.TARGET} + +SRCS+= unwind.h +CLEANFILES+= unwind.h |