OpenWrt – Diff between revs 2 and 3
?pathlinks?
| Rev 2 | Rev 3 | |||
|---|---|---|---|---|
| Line 1... | Line 1... | |||
| 1 | --- a/configure.ac |
1 | --- a/configure.ac |
|
| 2 | +++ b/configure.ac |
2 | +++ b/configure.ac |
|
| 3 | @@ -1277,13 +1277,13 @@ if test -z "$LD"; then |
3 | @@ -1300,13 +1300,13 @@ if test -z "$LD"; then |
|
| 4 | fi |
4 | fi |
|
| 5 | fi |
5 | fi |
|
| Line 6... | Line 6... | |||
| 6 | |
6 | |
|
| 7 | -# Check whether -static-libstdc++ -static-libgcc is supported. |
7 | -# Check whether -static-libstdc++ -static-libgcc is supported. |
|
| Line 13... | Line 13... | |||
| 13 | - LDFLAGS="$LDFLAGS -static-libstdc++ -static-libgcc" |
13 | - LDFLAGS="$LDFLAGS -static-libstdc++ -static-libgcc" |
|
| 14 | - AC_MSG_CHECKING([whether g++ accepts -static-libstdc++ -static-libgcc]) |
14 | - AC_MSG_CHECKING([whether g++ accepts -static-libstdc++ -static-libgcc]) |
|
| 15 | + LDFLAGS="$LDFLAGS -static-libstdc++" |
15 | + LDFLAGS="$LDFLAGS -static-libstdc++" |
|
| 16 | + AC_MSG_CHECKING([whether g++ accepts -static-libstdc++]) |
16 | + AC_MSG_CHECKING([whether g++ accepts -static-libstdc++]) |
|
| 17 | AC_LANG_PUSH(C++) |
17 | AC_LANG_PUSH(C++) |
|
| 18 | AC_LINK_IFELSE([AC_LANG_SOURCE([ |
18 | AC_LINK_IFELSE([ |
|
| 19 | #if (__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 5) |
19 | #if (__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 5) |
|
| 20 | @@ -1609,7 +1609,7 @@ AC_ARG_WITH(stage1-ldflags, |
20 | @@ -1632,7 +1632,7 @@ AC_ARG_WITH(stage1-ldflags, |
|
| 21 | # if supported. But if the user explicitly specified the libraries to use, |
21 | # if supported. But if the user explicitly specified the libraries to use, |
|
| 22 | # trust that they are doing what they want. |
22 | # trust that they are doing what they want. |
|
| 23 | if test "$stage1_libs" = "" -a "$have_static_libs" = yes; then |
23 | if test "$stage1_libs" = "" -a "$have_static_libs" = yes; then |
|
| 24 | - stage1_ldflags="-static-libstdc++ -static-libgcc" |
24 | - stage1_ldflags="-static-libstdc++ -static-libgcc" |
|
| 25 | + stage1_ldflags="-static-libstdc++" |
25 | + stage1_ldflags="-static-libstdc++" |
|
| 26 | fi]) |
26 | fi]) |
|
| 27 | AC_SUBST(stage1_ldflags) |
27 | AC_SUBST(stage1_ldflags) |
|
| Line 28... | Line 28... | |||
| 28 | |
28 | |
|
| 29 | @@ -1638,7 +1638,7 @@ AC_ARG_WITH(boot-ldflags, |
29 | @@ -1661,7 +1661,7 @@ AC_ARG_WITH(boot-ldflags, |
|
| 30 | # statically. But if the user explicitly specified the libraries to |
30 | # statically. But if the user explicitly specified the libraries to |
|
| 31 | # use, trust that they are doing what they want. |
31 | # use, trust that they are doing what they want. |
|
| 32 | if test "$poststage1_libs" = ""; then |
32 | if test "$poststage1_libs" = ""; then |
|
| 33 | - poststage1_ldflags="-static-libstdc++ -static-libgcc" |
33 | - poststage1_ldflags="-static-libstdc++ -static-libgcc" |
|
| 34 | + poststage1_ldflags="-static-libstdc++" |
34 | + poststage1_ldflags="-static-libstdc++" |
|
| 35 | fi]) |
35 | fi]) |
|
| Line 36... | Line 36... | |||
| 36 | AC_SUBST(poststage1_ldflags) |
36 | AC_SUBST(poststage1_ldflags) |
|
| 37 | |
37 | |
|
| 38 | --- a/configure |
38 | --- a/configure |
|
| 39 | +++ b/configure |
39 | +++ b/configure |
|
| 40 | @@ -5043,14 +5043,14 @@ if test -z "$LD"; then |
40 | @@ -5005,14 +5005,14 @@ if test -z "$LD"; then |
|
| Line 41... | Line 41... | |||
| 41 | fi |
41 | fi |
|
| 42 | fi |
42 | fi |
|
| Line 54... | Line 54... | |||
| 54 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether g++ accepts -static-libstdc++" >&5 |
54 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether g++ accepts -static-libstdc++" >&5 |
|
| 55 | +$as_echo_n "checking whether g++ accepts -static-libstdc++... " >&6; } |
55 | +$as_echo_n "checking whether g++ accepts -static-libstdc++... " >&6; } |
|
| 56 | ac_ext=cpp |
56 | ac_ext=cpp |
|
| 57 | ac_cpp='$CXXCPP $CPPFLAGS' |
57 | ac_cpp='$CXXCPP $CPPFLAGS' |
|
| 58 | ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
58 | ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
|
| 59 | @@ -5833,7 +5833,7 @@ else |
59 | @@ -5795,7 +5795,7 @@ else |
|
| 60 | # if supported. But if the user explicitly specified the libraries to use, |
60 | # if supported. But if the user explicitly specified the libraries to use, |
|
| 61 | # trust that they are doing what they want. |
61 | # trust that they are doing what they want. |
|
| 62 | if test "$stage1_libs" = "" -a "$have_static_libs" = yes; then |
62 | if test "$stage1_libs" = "" -a "$have_static_libs" = yes; then |
|
| 63 | - stage1_ldflags="-static-libstdc++ -static-libgcc" |
63 | - stage1_ldflags="-static-libstdc++ -static-libgcc" |
|
| 64 | + stage1_ldflags="-static-libstdc++" |
64 | + stage1_ldflags="-static-libstdc++" |
|
| 65 | fi |
65 | fi |
|
| 66 | fi |
66 | fi |
|
| Line 67... | Line 67... | |||
| 67 | |
67 | |
|
| 68 | @@ -5869,7 +5869,7 @@ else |
68 | @@ -5831,7 +5831,7 @@ else |
|
| 69 | # statically. But if the user explicitly specified the libraries to |
69 | # statically. But if the user explicitly specified the libraries to |
|
| 70 | # use, trust that they are doing what they want. |
70 | # use, trust that they are doing what they want. |
|
| 71 | if test "$poststage1_libs" = ""; then |
71 | if test "$poststage1_libs" = ""; then |
|
| 72 | - poststage1_ldflags="-static-libstdc++ -static-libgcc" |
72 | - poststage1_ldflags="-static-libstdc++ -static-libgcc" |
|