commit e8794ac9e0e20346ef458fe6ffc5f3e6a665c6cf
author Andrew Hsieh <andrewhsieh@google.com> Wed Mar 20 15:34:31 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 20 15:34:31 2013 +0000
tree 6649966a662e8f15ba902e4708c4e232da7badaf
parent 5504490d6e08053f3ae5c096a9481c7218a9c5e0
parent 3508d6a8bdb2510e70461dfcab8cfc184d92a30b

Merge "Link libgcc and libstdc++ statically on mingw build of llvm"

build/tools/build-llvm.sh

diff --git a/build/tools/build-llvm.sh b/build/tools/build-llvm.sh
index c6acd3b..6edb9cc 100755
--- a/build/tools/build-llvm.sh
+++ b/build/tools/build-llvm.sh
@@ -155,6 +155,11 @@
 CFLAGS_FOR_BUILD="-O2 -I$TOOLCHAIN_BUILD_PREFIX/include"
 LDFLAGS_FOR_BUILD="-L$TOOLCHAIN_BUILD_PREFIX/lib"
 
+# Eliminate dependency on libgcc_s_sjlj-1.dll and libstdc++-6.dll on cross builds
+if [ "$DARWIN" = "yes" -o "$MINGW" = "yes" ]; then
+    LDFLAGS_FOR_BUILD=$LDFLAGS_FOR_BUILD" -static-libgcc -static-libstdc++"
+fi
+
 CFLAGS="$CFLAGS $CFLAGS_FOR_BUILD $HOST_CFLAGS"
 CXXFLAGS="$CXXFLAGS $CFLAGS_FOR_BUILD $HOST_CFLAGS"  # polly doesn't look at CFLAGS !
 LDFLAGS="$LDFLAGS $LDFLAGS_FOR_BUILD $HOST_LDFLAGS"