From 2cf560f83922e6df9626ba3ee063c1caf6797548 Mon Sep 17 00:00:00 2001 From: laurentlb Date: Wed, 6 Dec 2017 05:57:09 -0800 Subject: [PATCH] Update version of re2 The latest version of re2 contains fixes that makes it compatible with new changes in Bazel. Fixes #4233 RELNOTES: None. PiperOrigin-RevId: 178087275 --- WORKSPACE | 6 +++--- compile.sh | 8 +++----- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index e8ed565d5237b8..25ae376959d8ac 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -140,10 +140,10 @@ http_archive( http_archive( name = "com_googlesource_code_re2", urls = [ - "https://github.com/google/re2/archive/2017-08-01.tar.gz", + "https://github.com/google/re2/archive/2017-12-01.tar.gz", ], - strip_prefix = "re2-2017-08-01", - sha256 = "938723dc197125392698c5fcf41acb74877866ff140b81fd50b7314bf26f1636", + strip_prefix = "re2-2017-12-01", + sha256 = "62797e7cd7cc959419710cd25b075b5f5b247da0e8214d47bf5af9b32128fb0d", ) # For src/test/shell/bazel:bazel_sandboxing_test diff --git a/compile.sh b/compile.sh index 23412730ad58bf..8a8a584dda3bf0 100755 --- a/compile.sh +++ b/compile.sh @@ -28,8 +28,7 @@ set -o errexit # when running "find". hash tr >&/dev/null || { echo >&2 "ERROR: cannot locate GNU coreutils; check your PATH." - echo >&2 " You may need to run the following command:" - echo >&2 " export PATH=\"/bin:/usr/bin:\$PATH\"" + echo >&2 " (You may need to run 'export PATH=/bin:/usr/bin:\$PATH)'" exit 1 } @@ -39,9 +38,8 @@ case "$(uname -s | tr [:upper:] [:lower:])" in msys*|mingw*|cygwin*) which python.exe >&/dev/null || { echo >&2 "ERROR: cannot locate python.exe; check your PATH." - echo >&2 " You may need to run the following command, or something" - echo >&2 " similar, depending on where you installed Python:" - echo >&2 " export PATH=\"/c/Python27:\$PATH\"" + echo >&2 " (You may need to run 'export PATH=/c/Python27:\$PATH)' or similar," + echo >&2 " depending on where you installed Python)." exit 1 } esac