diff options
| author |  Han-Wen Nienhuys <hanwen@google.com> | 2015-04-09 17:50:19 +0000 |
|---|---|---|
| committer |  Kristina Chodorow <kchodorow@google.com> | 2015-04-09 19:03:26 +0000 |
| commit | b5bac8ba0874c51162770bf20042610280bfca25 (patch) | |
| tree | 31c8a02d0fb4e1f6d1259a6358139b3aefac6efc | |
| parent | a05ed5572042624b6842dacc27fa2e0aad003786 (diff) | |
Use new protoc binary for compiling Bazel on linux.
--
MOS_MIGRATED_REVID=90725916
| -rwxr-xr-x | compile.sh | 2 | ||||
| -rw-r--r-- | third_party/BUILD | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/compile.sh b/compile.sh index 39de894aa5..c7302f9af9 100755 --- a/compile.sh +++ b/compile.sh @@ -126,7 +126,7 @@ linux) MD5SUM="md5sum" # JAVA_HOME must point to a Java 8 installation. JAVA_HOME=${JAVA_HOME:-$(readlink -f $(which javac) | sed "s_/bin/javac__")} - PROTOC=${PROTOC:-third_party/protobuf/protoc.amd64} + PROTOC=${PROTOC:-third_party/protobuf/protoc.linux-i686} ;; darwin) diff --git a/third_party/BUILD b/third_party/BUILD index dd49116206..da37569c05 100644 --- a/third_party/BUILD +++ b/third_party/BUILD @@ -12,7 +12,7 @@ filegroup( ":windows_msys64_mingw64": ["protobuf/protoc.exe"], ":windows_clang": ["protobuf/protoc.exe"], ":darwin": ["protobuf/protoc.darwin"], - "//conditions:default": ["protobuf/protoc.amd64"], + "//conditions:default": ["protobuf/protoc.linux-i686"], }), ) |