From 5d3f4f117a0e8e14618ecbb1a1e08f11e2a1b7ab Mon Sep 17 00:00:00 2001
From: "Bernhard M. Wiedemann" <bwiedemann@suse.de>
Date: Wed, 8 Nov 2017 19:46:14 +0100
Subject: Make bazel work with java9

unlike earlier versions,
openjdk9 returns "javac 9" when asked for its version

Closes #4004.

PiperOrigin-RevId: 175029317
---
 scripts/bootstrap/buildenv.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'scripts')

diff --git a/scripts/bootstrap/buildenv.sh b/scripts/bootstrap/buildenv.sh
index c7e381c33e..5c5061b45d 100755
--- a/scripts/bootstrap/buildenv.sh
+++ b/scripts/bootstrap/buildenv.sh
@@ -287,8 +287,8 @@ function get_java_version() {
     || fail "JAVA_HOME ($JAVA_HOME) is not a path to a working JDK."
 
   JAVAC_VERSION=$("${JAVAC}" -version 2>&1)
-  if [[ "$JAVAC_VERSION" =~ javac\ (1\.([789]|[1-9][0-9])).*$ ]]; then
-    JAVAC_VERSION=${BASH_REMATCH[1]}
+  if [[ "$JAVAC_VERSION" =~ javac\ ((1\.)?([789]|[1-9][0-9])).*$ ]]; then
+    JAVAC_VERSION=1.${BASH_REMATCH[3]}
   else
     fail \
       "Cannot determine JDK version, please set \$JAVA_HOME.\n" \
-- 
cgit v1.2.3