From 1b1a8f40172518b8dc1f6c16202ca545beea162e Mon Sep 17 00:00:00 2001 From: Jisi Liu Date: Thu, 28 Jul 2016 19:07:54 +0000 Subject: Fix build protoc script for windows --- protoc-artifacts/build-protoc.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'protoc-artifacts') 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 -- cgit v1.2.3