organicmaps/protobuf
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Merge pull request #1871 from pherl/fixwin

Browse source 
Fix build protoc script for windows
This commit is contained in:
Jisi Liu 2016-07-28 12:53:42 -07:00 • committed by GitHub
commit 2662fd3d0c
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
protoc-artifacts/build-protoc.sh
View file

@ -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