summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordholland <dholland>2008-09-07 03:23:16 +0000
committerdholland <dholland>2008-09-07 03:23:16 +0000
commit46c28e355e0bc710199840f6cf9ffe4d408ac0b5 (patch)
tree198ca37dc81ae87eb1f524605d024acf994f5ee9
parentfdcc044b34611d45942d2ba126d444eacd8bae39 (diff)
downloadpkgsrc-46c28e355e0bc710199840f6cf9ffe4d408ac0b5.tar.gz
And now, add some logic so if gcc declines to configure libjava, as
happens by default on amd64, the build will fail instead of silently skipping it.
-rw-r--r--lang/gcc3-java/Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/lang/gcc3-java/Makefile b/lang/gcc3-java/Makefile
index 2d0b7458d1e..cf663f3e5e0 100644
--- a/lang/gcc3-java/Makefile
+++ b/lang/gcc3-java/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2008/09/07 03:14:04 dholland Exp $
+# $NetBSD: Makefile,v 1.25 2008/09/07 03:23:16 dholland Exp $
PKGNAME= gcc3${GCC3_PKGMODIF}-java-${GCC_VERSION}
COMMENT= GNU Compiler Collection, v3 - Java compiler
@@ -30,6 +30,9 @@ REPLACE_FILES.awk+= libjava/addr2name.awk
do-build:
cd ${WRKSRC}/gcc && ${SETENV} ${MAKE_ENV} ${GMAKE} java
+ cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
+ ${GMAKE} configure-target-libjava
+ [ -f ${WRKSRC}/libjava/Makefile ] || ${FALSE}
${ULIMIT_CMD_datasize}; cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
${GMAKE} all-target-libjava