You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by jf...@apache.org on 2013/08/17 21:46:05 UTC

git commit: THRIFT-2134: mingw-cross-compile script failing with strip errors Client: build Patch: jfarrell

Updated Branches:
  refs/heads/master 16ff233a7 -> 985a910b1


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.


Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/985a910b
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/985a910b
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/985a910b

Branch: refs/heads/master
Commit: 985a910b1b4bd9c546ef0857aed7f56ed21ea65c
Parents: 16ff233
Author: jfarrell <jf...@apache.org>
Authored: Sat Aug 17 15:44:19 2013 -0400
Committer: jfarrell <jf...@apache.org>
Committed: Sat Aug 17 15:44:19 2013 -0400

----------------------------------------------------------------------
 contrib/mingw-cross-compile.sh | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/thrift/blob/985a910b/contrib/mingw-cross-compile.sh
----------------------------------------------------------------------
diff --git a/contrib/mingw-cross-compile.sh b/contrib/mingw-cross-compile.sh
index 80c0e29..894ae5f 100755
--- 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