diff options
| author | wiz <wiz@pkgsrc.org> | 2020-04-01 14:08:14 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2020-04-01 14:08:14 +0000 |
| commit | dc6a9bd515f2f9f8cb7088f77c58dd97808e0987 (patch) | |
| tree | 0a83b65934f6b2b7bc3274b4b5c33818a4e145a3 | |
| parent | 9262bd27702325e553d07142bf15e391f9e37284 (diff) | |
| download | pkgsrc-dc6a9bd515f2f9f8cb7088f77c58dd97808e0987.tar.gz | |
gcc7: reduce differences to gcc8
mostly, make dejagnu a TEST_DEPENDS
| -rw-r--r-- | lang/gcc7/Makefile | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/lang/gcc7/Makefile b/lang/gcc7/Makefile index 6e8806c7dc7..751ab077c2f 100644 --- a/lang/gcc7/Makefile +++ b/lang/gcc7/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2020/03/22 10:56:25 rillig Exp $ +# $NetBSD: Makefile,v 1.31 2020/04/01 14:08:14 wiz Exp $ GCC_PKGNAME= gcc7 .include "version.mk" @@ -83,7 +83,7 @@ SUBST_SED.fixinc= -e "s,\./fixinc.sh,-c true," .include "options.mk" .if !empty(MACHINE_PLATFORM:MNetBSD-*-*) -# native SSP conflicts with gcc's libssp +# on NetBSD, use the native SSP code in libc CONFIGURE_ARGS+= --disable-libssp # Match base libstdc++ major SUBST_CLASSES+= libstdc @@ -169,16 +169,8 @@ SUBST_SED.ccs= -e 's,/usr/ccs/bin,/usr/bin,g' pre-configure: ${RUN} cd ${WRKSRC} && ${MKDIR} ${OBJDIR} -TEST_TARGET= -k check || ${TRUE} - -pre-test: - ${RUN} \ - if runtest --version >/dev/null 2>/dev/null ; then \ - : ; \ - else \ - ${ECHO} "ERROR: Please install devel/dejagnu in order to run the test suite."; \ - exit 1; \ - fi +TEST_TARGET= -j ${MAKE_JOBS} -k check || ${TRUE} +TEST_DEPENDS+= dejagnu-[0-9]*:../../devel/dejagnu post-test: ${RUN} cd ${WRKSRC} && cd ${OBJDIR} && \ |