diff options
Diffstat (limited to 'Mk/bsd.java.mk')
| -rw-r--r-- | Mk/bsd.java.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Mk/bsd.java.mk b/Mk/bsd.java.mk index 88c153df15a9..1dc1d116ebc5 100644 --- a/Mk/bsd.java.mk +++ b/Mk/bsd.java.mk @@ -394,9 +394,10 @@ JAVA_PORT_OS_DESCRIPTION:= ${JAVA_PORT_OS:S/^/\${_JAVA_OS_/:S/$/}/} . undef HAVE_JIKES -# Enforce USE_JIKES=NO if not defined and using Java 1.5 +# Enforce USE_JIKES=NO if not defined and using Java 1.5+ # XXX: This is a temporary fix to be removed when Jikes supports Java 1.5 -. if ${JAVA_PORT_VERSION:C/^([0-9])\.([0-9])(.*)$/\1.\2/} == "1.5" +. if (${JAVA_PORT_VERSION:C/^([0-9])\.([0-9])(.*)$/\1.\2/} == "1.5") || \ + (${JAVA_PORT_VERSION:C/^([0-9])\.([0-9])(.*)$/\1.\2/} == "1.6") USE_JIKES?= NO . endif # First test if USE_JIKES has a valid value |