From 960f22c11dc282ef872080f8c1ad50bdff4a99ad Mon Sep 17 00:00:00 2001 From: Neil Fuller Date: Thu, 16 Oct 2014 10:23:03 +0100 Subject: [PATCH] Add OpenJDK 8 experimental support Targeting 1.7: just adding support for the tools. Various issues exist with OpenJDK 8: it doesn't build to completion yet. Change-Id: I54942f497264234e4bef488c8d17d243b4ef2f14 --- core/main.mk | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/core/main.mk b/core/main.mk index b628c8fb5..7791c3ed1 100644 --- a/core/main.mk +++ b/core/main.mk @@ -139,11 +139,19 @@ endif java_version_str := $(shell unset _JAVA_OPTIONS && java -version 2>&1) javac_version_str := $(shell unset _JAVA_OPTIONS && javac -version 2>&1) -# Check for the correct version of java. +# Check for the correct version of java, should be 1.7 by +# default, and 1.8 if EXPERIMENTAL_USE_JAVA8 is set +ifneq ($(EXPERIMENTAL_USE_JAVA8),) +required_version := "1.8.x" +required_javac_version := "1.8" +java_version := $(shell echo '$(java_version_str)' | grep 'openjdk .*[ "]1\.8[\. "$$]') +javac_version := $(shell echo '$(javac_version_str)' | grep '[ "]1\.8[\. "$$]') +else # default required_version := "1.7.x" required_javac_version := "1.7" java_version := $(shell echo '$(java_version_str)' | grep '^java .*[ "]1\.7[\. "$$]') javac_version := $(shell echo '$(javac_version_str)' | grep '[ "]1\.7[\. "$$]') +endif # if EXPERIMENTAL_USE_JAVA8 ifeq ($(strip $(java_version)),) $(info ************************************************************) -- 2.11.0