summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/main.mk5
1 files changed, 4 insertions, 1 deletions
diff --git a/core/main.mk b/core/main.mk
index fbc4fc8..04be6e6 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -158,7 +158,7 @@ javac_version_str := $(shell unset _JAVA_OPTIONS && javac -version 2>&1)
ifneq ($(EXPERIMENTAL_USE_JAVA8),)
required_version := "1.8.x"
required_javac_version := "1.8"
-java_version := $(shell echo '$(java_version_str)' | grep '.*[ "]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"
@@ -185,6 +185,9 @@ endif
#
# For Java 1.7, we require OpenJDK on linux and Oracle JDK on Mac OS.
requires_openjdk := false
+ifeq ($(HOST_OS), linux)
+requires_openjdk := true
+endif
# Check for the current jdk