diff options
| author |  Jisi Liu <jisi.liu@gmail.com> | 2016-07-28 19:07:54 +0000 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2016-07-28 19:07:54 +0000 |
| commit | 1b1a8f40172518b8dc1f6c16202ca545beea162e (patch) | |
| tree | 21f1096c44b5f09f5288c981dda2d142126794cd /protoc-artifacts | |
| parent | e8ae137c96444ea313485ed1118c5e43b2099cf1 (diff) | |
Fix build protoc script for windows
Diffstat (limited to 'protoc-artifacts')
| -rwxr-xr-x | protoc-artifacts/build-protoc.sh | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/protoc-artifacts/build-protoc.sh b/protoc-artifacts/build-protoc.sh index 328d6731..e31948e9 100755 --- a/protoc-artifacts/build-protoc.sh +++ b/protoc-artifacts/build-protoc.sh @@ -147,6 +147,7 @@ cd "$(dirname "$0")" WORKING_DIR=$(pwd) CONFIGURE_ARGS="--disable-shared" +TARGET_FILE=target/$MAKE_TARGET.exe if [[ "$OS" == windows ]]; then MAKE_TARGET="${MAKE_TARGET}.exe" fi @@ -221,13 +222,10 @@ fi export CXXFLAGS LDFLAGS -TARGET_FILE=target/$MAKE_TARGET.exe - cd "$WORKING_DIR"/.. && ./configure $CONFIGURE_ARGS && - cd src && make clean && make $MAKE_TARGET -j4 && + cd src && make clean && make $MAKE_TARGET && cd "$WORKING_DIR" && mkdir -p target && - (cp ../src/$MAKE_TARGET $TARGET_FILE || - cp ../src/$MAKE_TARGET.exe $TARGET_FILE) || + cp ../src/$MAKE_TARGET $TARGET_FILE || exit 1 if [[ "$OS" == osx ]]; then |