aboutsummaryrefslogtreecommitdiffhomepage
path: root/scripts/bootstrap
diff options
context:
space:
mode:
authorGravatar Damien Martin-Guillerez <dmarting@google.com>2017-02-16 10:55:03 +0100
committerGravatar Damien Martin-Guillerez <dmarting@google.com>2017-02-16 10:55:03 +0100
commit89cc544beb53a6de970a17425483e0fa7ed48b41 (patch)
tree2d487b25bf9981d4e77d90c831cf70d3ef3766c8 /scripts/bootstrap
parentefe4a6d889d6a6f563a1d492530f13351ce4eef7 (diff)
Revert "Add javac-9-dev-r3297-3"
This reverts commit efe4a6d889d6a6f563a1d492530f13351ce4eef7. This commit broke several downstream project with a bug in the Java compiler, see http://ci.bazel.io/job/intellij-clion/78/BAZEL_VERSION=HEAD,PLATFORM_NAME=linux-x86_64/console
Diffstat (limited to 'scripts/bootstrap')
-rwxr-xr-xscripts/bootstrap/compile.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/bootstrap/compile.sh b/scripts/bootstrap/compile.sh
index 50147266d1..cbfb2462bb 100755
--- a/scripts/bootstrap/compile.sh
+++ b/scripts/bootstrap/compile.sh
@@ -17,7 +17,7 @@
# Script for building bazel from scratch without bazel
PROTO_FILES=$(ls src/main/protobuf/*.proto src/main/java/com/google/devtools/build/lib/buildeventstream/proto/*.proto)
-LIBRARY_JARS=$(find third_party -name '*.jar' | grep -Fv /javac-9-dev-r3297-3.jar | grep -Fv /javac7.jar | grep -Fv JavaBuilder | grep -ve third_party/grpc/grpc.*jar | tr "\n" " ")
+LIBRARY_JARS=$(find third_party -name '*.jar' | grep -Fv /javac-9-dev-r3297-1.jar | grep -Fv /javac7.jar | grep -Fv JavaBuilder | grep -ve third_party/grpc/grpc.*jar | tr "\n" " ")
GRPC_JAVA_VERSION=0.15.0
GRPC_LIBRARY_JARS=$(find third_party/grpc -name '*.jar' | grep -e .*${GRPC_JAVA_VERSION}.*jar | tr "\n" " ")
LIBRARY_JARS="${LIBRARY_JARS} ${GRPC_LIBRARY_JARS}"