THRIFT-2134: mingw-cross-compile script failing with strip errors

Client: build
Patch: jfarrell

Updates the mingw build script to use the -o option when striping.

diff --git a/contrib/mingw-cross-compile.sh b/contrib/mingw-cross-compile.sh
index 80c0e29..894ae5f 100755 (executable)
--- a/contrib/mingw-cross-compile.sh
+++ b/contrib/mingw-cross-compile.sh
@@ -12,6 +12,8 @@ set -e
   --without-perl \
   --without-php \
   --without-erlang \
+  --without-go \
+  --without-d \
   --build=i686-pc-linux-gnu \
   --host=i586-mingw32msvc \
   CPPFLAGS='-DMINGW'
@@ -19,10 +21,10 @@ set -e
 make
 
 # Check two locations to be compatible with libtool 1.5.26 or 2.2.6b.
-if test -f compiler/cpp/.libs/thrift.exe
-  then cp compiler/cpp/.libs/thrift.exe ./thrift.exe
-  else cp compiler/cpp/thrift.exe ./thrift.exe
+if test -f compiler/cpp/.libs/thrift.exe ; then
+  i586-mingw32msvc-strip compiler/cpp/.libs/thrift.exe -o ./thrift.exe
+else 
+  i586-mingw32msvc-strip compiler/cpp/thrift.exe -o ./thrift.exe
 fi
-i586-mingw32msvc-strip ./thrift.exe
-echo
+echo "Finished compiling with resulting exe"
 ls -l ./thrift.exe