1
0

110-shared_libgcc.patch 2.7 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576
  1. --- a/configure.ac
  2. +++ b/configure.ac
  3. @@ -1283,13 +1283,13 @@ if test -z "$LD"; then
  4. fi
  5. fi
  6. -# Check whether -static-libstdc++ -static-libgcc is supported.
  7. +# Check whether -static-libstdc++ is supported.
  8. have_static_libs=no
  9. if test "$GCC" = yes; then
  10. saved_LDFLAGS="$LDFLAGS"
  11. - LDFLAGS="$LDFLAGS -static-libstdc++ -static-libgcc"
  12. - AC_MSG_CHECKING([whether g++ accepts -static-libstdc++ -static-libgcc])
  13. + LDFLAGS="$LDFLAGS -static-libstdc++"
  14. + AC_MSG_CHECKING([whether g++ accepts -static-libstdc++])
  15. AC_LANG_PUSH(C++)
  16. AC_LINK_IFELSE([AC_LANG_SOURCE([
  17. #if (__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 5)
  18. @@ -1629,7 +1629,7 @@ AC_ARG_WITH(stage1-ldflags,
  19. # trust that they are doing what they want.
  20. if test "$with_static_standard_libraries" = yes -a "$stage1_libs" = "" \
  21. -a "$have_static_libs" = yes; then
  22. - stage1_ldflags="-static-libstdc++ -static-libgcc"
  23. + stage1_ldflags="-static-libstdc++"
  24. fi])
  25. AC_SUBST(stage1_ldflags)
  26. @@ -1658,7 +1658,7 @@ AC_ARG_WITH(boot-ldflags,
  27. # statically. But if the user explicitly specified the libraries to
  28. # use, trust that they are doing what they want.
  29. if test "$poststage1_libs" = ""; then
  30. - poststage1_ldflags="-static-libstdc++ -static-libgcc"
  31. + poststage1_ldflags="-static-libstdc++"
  32. fi])
  33. AC_SUBST(poststage1_ldflags)
  34. --- a/configure
  35. +++ b/configure
  36. @@ -5053,14 +5053,14 @@ if test -z "$LD"; then
  37. fi
  38. fi
  39. -# Check whether -static-libstdc++ -static-libgcc is supported.
  40. +# Check whether -static-libstdc++ is supported.
  41. have_static_libs=no
  42. if test "$GCC" = yes; then
  43. saved_LDFLAGS="$LDFLAGS"
  44. - LDFLAGS="$LDFLAGS -static-libstdc++ -static-libgcc"
  45. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether g++ accepts -static-libstdc++ -static-libgcc" >&5
  46. -$as_echo_n "checking whether g++ accepts -static-libstdc++ -static-libgcc... " >&6; }
  47. + LDFLAGS="$LDFLAGS -static-libstdc++"
  48. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether g++ accepts -static-libstdc++" >&5
  49. +$as_echo_n "checking whether g++ accepts -static-libstdc++... " >&6; }
  50. ac_ext=cpp
  51. ac_cpp='$CXXCPP $CPPFLAGS'
  52. ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  53. @@ -5861,7 +5861,7 @@ else
  54. # trust that they are doing what they want.
  55. if test "$with_static_standard_libraries" = yes -a "$stage1_libs" = "" \
  56. -a "$have_static_libs" = yes; then
  57. - stage1_ldflags="-static-libstdc++ -static-libgcc"
  58. + stage1_ldflags="-static-libstdc++"
  59. fi
  60. fi
  61. @@ -5897,7 +5897,7 @@ else
  62. # statically. But if the user explicitly specified the libraries to
  63. # use, trust that they are doing what they want.
  64. if test "$poststage1_libs" = ""; then
  65. - poststage1_ldflags="-static-libstdc++ -static-libgcc"
  66. + poststage1_ldflags="-static-libstdc++"
  67. fi
  68. fi