diff options
| author |  Kun Zhang <zhangkun@google.com> | 2015-04-16 17:30:07 -0700 |
|---|---|---|
| committer | Kun Zhang <zhangkun@google.com> | 2015-04-16 17:56:12 -0700 |
| commit | 90a7ed6fcc0891b0cf1d92c5c418990e35a6b5a7 (patch) | |
| tree | bf3fa05c711dd6e63b35212dc0f11aabb1bb2eed /protoc-artifacts/build-protoc.sh | |
| parent | 4e63b52088ce409bbe43e4a37863d43b136143f0 (diff) | |
A few fix-ups.
1. make google/protobuf/stubs/pbconfig.h before making protoc, otherwise it
won't build a freshly checked-out code.
2. Document the build environments that have been tested to work.
3. Add support for MINGW64
Diffstat (limited to 'protoc-artifacts/build-protoc.sh')
| -rwxr-xr-x | protoc-artifacts/build-protoc.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/protoc-artifacts/build-protoc.sh b/protoc-artifacts/build-protoc.sh index 96ca97c2..2f67c508 100755 --- a/protoc-artifacts/build-protoc.sh +++ b/protoc-artifacts/build-protoc.sh @@ -158,6 +158,9 @@ if [[ "$(uname)" == CYGWIN* ]]; then elif [[ "$(uname)" == MINGW32* ]]; then assertEq "$OS" windows $LINENO assertEq "$ARCH" x86_32 $LINENO +elif [[ "$(uname)" == MINGW64* ]]; then + assertEq "$OS" windows $LINENO + assertEq "$ARCH" x86_64 $LINENO elif [[ "$(uname)" == Linux* ]]; then if [[ "$OS" == linux ]]; then if [[ "$ARCH" == x86_64 ]]; then @@ -209,7 +212,7 @@ export CXXFLAGS LDFLAGS TARGET_FILE=target/protoc.exe cd "$WORKING_DIR"/.. && ./configure $CONFIGURE_ARGS && - cd src && make clean && make $MAKE_TARGET && + cd src && make clean && make google/protobuf/stubs/pbconfig.h $MAKE_TARGET && cd "$WORKING_DIR" && mkdir -p target && (cp ../src/protoc $TARGET_FILE || cp ../src/protoc.exe $TARGET_FILE) || exit 1 |