diff options
| author | Jisi Liu <liujisi@google.com> | 2016-07-28 13:13:46 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-28 13:13:46 -0700 |
| commit | 1f71f8bbf86d85fd5882fbf3f326fdb2f622cc8a (patch) | |
| tree | e261ee9d967e43f0c882bde2ee83d0fb74079379 | |
| parent | a1a718123f4edc9f77e2cd02691ffa10d2e87f49 (diff) | |
| parent | d608b376cfb622fa3296901b04d524e65a6690ba (diff) | |
| download | protobuf-javalite-1f71f8bbf86d85fd5882fbf3f326fdb2f622cc8a.tar.gz | |
Merge pull request #1872 from pherl/fixwin-javalite
Fix build protoc script for windows
| -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 |