Selaa lähdekoodia

Merge pull request #1871 from pherl/fixwin

Fix build protoc script for windows
Jisi Liu 9 vuotta sitten
vanhempi
commit
2662fd3d0c
1 muutettua tiedostoa jossa 3 lisäystä ja 5 poistoa
  1. 3 5
      protoc-artifacts/build-protoc.sh

+ 3 - 5
protoc-artifacts/build-protoc.sh

@@ -147,6 +147,7 @@ cd "$(dirname "$0")"
 WORKING_DIR=$(pwd)
 WORKING_DIR=$(pwd)
 CONFIGURE_ARGS="--disable-shared"
 CONFIGURE_ARGS="--disable-shared"
 
 
+TARGET_FILE=target/$MAKE_TARGET.exe
 if [[ "$OS" == windows ]]; then
 if [[ "$OS" == windows ]]; then
   MAKE_TARGET="${MAKE_TARGET}.exe"
   MAKE_TARGET="${MAKE_TARGET}.exe"
 fi
 fi
@@ -221,13 +222,10 @@ fi
 
 
 export CXXFLAGS LDFLAGS
 export CXXFLAGS LDFLAGS
 
 
-TARGET_FILE=target/$MAKE_TARGET.exe
-
 cd "$WORKING_DIR"/.. && ./configure $CONFIGURE_ARGS &&
 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 &&
   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
   exit 1
 
 
 if [[ "$OS" == osx ]]; then
 if [[ "$OS" == osx ]]; then