diff options
author | Adam Cozzette <acozzette@google.com> | 2017-11-30 13:34:51 -0800 |
---|---|---|
committer | Adam Cozzette <acozzette@google.com> | 2017-11-30 13:34:51 -0800 |
commit | a27da093393d3dc7301d27fe328284335cb98528 (patch) | |
tree | f594ef198ba98a8860b26b3db6cfcc718222ca19 /protoc-artifacts/README.md | |
parent | 6de51caed52d798815954646b230c5aef3e4d2fc (diff) | |
parent | 94bb1eed17209cacfdf2571be5a1ae91b3964cff (diff) | |
download | protobuf-a27da093393d3dc7301d27fe328284335cb98528.tar.gz protobuf-a27da093393d3dc7301d27fe328284335cb98528.tar.bz2 protobuf-a27da093393d3dc7301d27fe328284335cb98528.zip |
Merge branch '3.5.x' into 3.5.x-merge
Diffstat (limited to 'protoc-artifacts/README.md')
-rw-r--r-- | protoc-artifacts/README.md | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/protoc-artifacts/README.md b/protoc-artifacts/README.md index b306c7c3..ba3ca018 100644 --- a/protoc-artifacts/README.md +++ b/protoc-artifacts/README.md @@ -70,9 +70,9 @@ support. DO NOT close the staging repository until you have done the deployment for all platforms. Currently the following platforms are supported: - Linux (x86_32, x86_64 and cross compiled aarch_64) - Windows (x86_32 and x86_64) with - * Cygwin64 with MinGW compilers (x86_64) - * MSYS with MinGW32 (x86_32) - * Cross compile in Linux with MinGW-w64 (x86_32, x86_64) + - Cygwin64 with MinGW compilers (x86_64) + - MSYS with MinGW32 (x86_32) + - Cross compile in Linux with MinGW-w64 (x86_32, x86_64) - MacOSX (x86_32 and x86_64) As for MSYS2/MinGW64 for Windows: protoc will build, but it insists on @@ -177,8 +177,9 @@ stored: ### Tested build environments We have successfully built artifacts on the following environments: - Linux x86_32 and x86_64: - - Centos 6.6 (within Docker 1.6.1) - - Ubuntu 14.04.2 64-bit + - Centos 6.6 (within Docker 1.6.1) + - Ubuntu 14.04.2 64-bit +- Linux aarch_64: Cross compiled with `g++-aarch64-linux-gnu` on Ubuntu 14.04.2 64-bit - Windows x86_32: MSYS with ``mingw32-gcc-g++ 4.8.1-4`` on Windows 7 64-bit - Windows x86_32: Cross compile with ``i686-w64-mingw32-g++ 4.8.2`` on Ubuntu 14.04.2 64-bit - Windows x86_64: Cygwin64 with ``mingw64-x86_64-gcc-g++ 4.8.3-1`` on Windows 7 64-bit |