diff options
| author | rwild <rwild@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-01-16 14:46:57 +0000 |
|---|---|---|
| committer | rwild <rwild@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-01-16 14:46:57 +0000 |
| commit | 011fed15322bb8aca1831bb1a31e5e6f7b4e8624 (patch) | |
| tree | 03aac1fd229668a4ec04abf179056fbfbccfb328 | |
| parent | a72f32395fa7e865ce2fe097750a999c6d20979a (diff) | |
| download | ppe42-gcc-011fed15322bb8aca1831bb1a31e5e6f7b4e8624.tar.gz ppe42-gcc-011fed15322bb8aca1831bb1a31e5e6f7b4e8624.zip | |
Fix PR 35942: remove -lstdc++ from libtool postdeps for CXX.
libstdc++-v3/:
PR libstdc++/35942
* configure.ac: Remove -lstdc++ from libtool's postdeps_CXX.
* configure: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@155965 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rwxr-xr-x | libstdc++-v3/configure | 15 | ||||
| -rw-r--r-- | libstdc++-v3/configure.ac | 3 |
3 files changed, 18 insertions, 6 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index ddd9acd3762..cd65c4fa4c8 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2010-01-16 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + + PR libstdc++/35942 + * configure.ac: Remove -lstdc++ from libtool's postdeps_CXX. + * configure: Regenerate. + 2010-01-15 Phil Muldoon <pmuldoon@redhat.com> * python/libstdcxx/v6/printers.py (StdStringPrinter.__init__): diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index 2abdfc2451a..1c6bec4c9fe 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -14815,6 +14815,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +# Eliminate -lstdc++ addition to postdeps for cross compiles. +postdeps_CXX=`echo " $postdeps_CXX " | sed 's, -lstdc++ ,,g'` + # Possibly disable most of the library. ## TODO: Consider skipping unncessary tests altogether in this case, rather ## than just ignoring the results. Faster /and/ more correct, win win. @@ -14884,7 +14887,7 @@ fi # # Fake what AC_TRY_COMPILE does. XXX Look at redoing this new-style. cat > conftest.$ac_ext << EOF -#line 14887 "configure" +#line 14890 "configure" struct S { ~S(); }; void bar(); void foo() @@ -15252,7 +15255,7 @@ $as_echo "$glibcxx_cv_atomic_long_long" >&6; } # Fake what AC_TRY_COMPILE does. cat > conftest.$ac_ext << EOF -#line 15255 "configure" +#line 15258 "configure" int main() { typedef bool atomic_type; @@ -15289,7 +15292,7 @@ $as_echo "$glibcxx_cv_atomic_bool" >&6; } rm -f conftest* cat > conftest.$ac_ext << EOF -#line 15292 "configure" +#line 15295 "configure" int main() { typedef short atomic_type; @@ -15326,7 +15329,7 @@ $as_echo "$glibcxx_cv_atomic_short" >&6; } rm -f conftest* cat > conftest.$ac_ext << EOF -#line 15329 "configure" +#line 15332 "configure" int main() { // NB: _Atomic_word not necessarily int. @@ -15364,7 +15367,7 @@ $as_echo "$glibcxx_cv_atomic_int" >&6; } rm -f conftest* cat > conftest.$ac_ext << EOF -#line 15367 "configure" +#line 15370 "configure" int main() { typedef long long atomic_type; @@ -15440,7 +15443,7 @@ $as_echo "$as_me: WARNING: Performance of certain classes will degrade as a resu # unnecessary for this test. cat > conftest.$ac_ext << EOF -#line 15443 "configure" +#line 15446 "configure" int main() { _Decimal32 d1; diff --git a/libstdc++-v3/configure.ac b/libstdc++-v3/configure.ac index 0137f0a1c66..9fe9c33964c 100644 --- a/libstdc++-v3/configure.ac +++ b/libstdc++-v3/configure.ac @@ -98,6 +98,9 @@ AM_PROG_LIBTOOL AC_SUBST(enable_shared) AC_SUBST(enable_static) +# Eliminate -lstdc++ addition to postdeps for cross compiles. +postdeps_CXX=`echo " $postdeps_CXX " | sed 's, -lstdc++ ,,g'` + # Possibly disable most of the library. ## TODO: Consider skipping unncessary tests altogether in this case, rather ## than just ignoring the results. Faster /and/ more correct, win win. |
