summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--java/cacao/Makefile7
1 files changed, 2 insertions, 5 deletions
diff --git a/java/cacao/Makefile b/java/cacao/Makefile
index d18138f960c7..91082231aa33 100644
--- a/java/cacao/Makefile
+++ b/java/cacao/Makefile
@@ -12,6 +12,8 @@ COMMENT= JIT compiler for JAVA
LICENSE= GPLv2
+ONLY_FOR_ARCHS= amd64 i386
+
BUILD_DEPENDS= ${LOCALBASE}/share/classpath/glibj.zip:java/classpath
RUN_DEPENDS= ${LOCALBASE}/share/classpath/glibj.zip:java/classpath
@@ -24,8 +26,6 @@ CONFIGURE_ARGS= --disable-test-dependency-checks \
--with-build-java-runtime-library-classes=${LOCALBASE}/share/classpath/glibj.zip
CONFIGURE_ENV= JAVAC="${JAVAC}" JAR="${JAR}"
-ONLY_FOR_ARCHS= amd64 i386
-
OPTIONS_DEFINE= JDK
OPTIONS_DEFAULT=JDK
JDK_DESC= Build with native JDK
@@ -37,9 +37,6 @@ BUILD_DEPENDS+= ${LOCALBASE}/bootstrap-openjdk6/bin/javac:java/bootstrap-openjdk
JAR= ${LOCALBASE}/bootstrap-openjdk6/bin/jar
JAVAC= ${LOCALBASE}/bootstrap-openjdk6/bin/javac
.else
-.if defined(WITH_GCC)
-GCC_SUFX= ${WITH_GCC:S/.//}
-.endif
GCC_SUFX?= 46
BUILD_DEPENDS+= gcj${GCC_SUFX}:lang/gcc${GCC_SUFX}
EXTRA_PATCHES= ${FILESDIR}/gcj.patch