commit ab1e24c9783b6a3c190ca87aa7e6aa47440433be
author Andrew Hsieh <andrewhsieh@google.com> Fri Dec 28 19:02:49 2012 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 28 19:02:49 2012 -0800
tree 056df1274214b06d419edf8988087bcb326dbf3a
parent f4c9836dc02a422759db069908199399d31c11f4
parent 97183bfcb4a3f4cbf3dbff4d8b011c61d447db54

Merge "Statically link libgcc and libstdc++ into gold"

build/tools/build-host-gcc.sh

diff --git a/build/tools/build-host-gcc.sh b/build/tools/build-host-gcc.sh
index 84cb9cc..50c480d 100755
--- a/build/tools/build-host-gcc.sh
+++ b/build/tools/build-host-gcc.sh
@@ -494,7 +494,8 @@
     local RET
     case $1 in
         arm-*-4.4.3|x86-*-4.4.3|x86-4.4.3) RET=2.19;;
-        *) RET=2.21;;
+        *-4.6) RET=2.21;;
+        *) RET=2.22;;
     esac
     echo "$RET"
 }
@@ -776,8 +777,6 @@
                 *) panic "Sorry, this script only supports building windows binaries on Linux."
                 ;;
             esac
-            HOST_CFLAGS=$HOST_CFLAGS" -D__USE_MINGW_ANSI_STDIO=1"
-            HOST_CXXFLAGS=$HOST_CXXFLAGS" -D__USE_MINGW_ANSI_STDIO=1"
             ;;
 
         windows-x86_64)
@@ -823,8 +822,6 @@
                 *) panic "Sorry, this script only supports building windows binaries on Linux."
                 ;;
             esac
-            HOST_CFLAGS=$HOST_CFLAGS" -D__USE_MINGW_ANSI_STDIO=1"
-            HOST_CXXFLAGS=$HOST_CXXFLAGS" -D__USE_MINGW_ANSI_STDIO=1"
             ;;
     esac
 
@@ -1317,6 +1314,12 @@
                 ARGS=$ARGS" --enable-gold=both/gold"
             fi
         fi
+        if [ "$HOST_OS" = 'windows' ]; then
+            # gold may have runtime dependency on libgcc_sjlj_1.dll and
+            # libstdc++-6.dll when built by newer versions of mingw.
+            # Link them statically to avoid that.
+            ARGS=$ARGS" --with-gold-ldflags='-static-libgcc -static-libstdc++'"
+        fi
     fi
 
     # This is used to install libbfd which is later used to compile