From 474ee90816f960259d99c5deeeac54a559bd4f34 Mon Sep 17 00:00:00 2001 From: Rainer Orth Date: Mon, 21 Mar 2011 12:26:30 +0000 Subject: [PATCH] re PR bootstrap/48120 (libpwl test must use g++) PR bootstrap/48120: * configure.ac (pwllib): Use LIBS instead of LDFLAGS. Add -lstdc++ -lm to LIBS. * configure: Regenerate. From-SVN: r171225 --- ChangeLog | 7 +++++++ configure | 6 +++--- configure.ac | 8 ++++---- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6be0c84b4fb..011b796a27e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2011-03-21 Rainer Orth + + PR bootstrap/48120: + * configure.ac (pwllib): Use LIBS instead of LDFLAGS. + Add -lstdc++ -lm to LIBS. + * configure: Regenerate. + 2011-03-18 David Edelsohn * config.guess: Update to version 2011-02-02 diff --git a/configure b/configure index 32f239ea4ed..9725f92a0df 100755 --- a/configure +++ b/configure @@ -5725,8 +5725,8 @@ fi if test "x$with_ppl" != xno; then if test "x$pwllib" = x; then - saved_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $ppllibs" + saved_LIBS="$LIBS" + LIBS="$LIBS $ppllibs -lstdc++ -lm" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PWL_handle_timeout in -lpwl" >&5 $as_echo_n "checking for PWL_handle_timeout in -lpwl... " >&6; } if test "${ac_cv_lib_pwl_PWL_handle_timeout+set}" = set; then : @@ -5767,7 +5767,7 @@ if test "x$ac_cv_lib_pwl_PWL_handle_timeout" = x""yes; then : pwllib="-lpwl" fi - LDFLAGS="$saved_LDFLAGS" + LIBS="$saved_LIBS" fi ppllibs="$ppllibs -lppl_c -lppl $pwllib -lgmpxx" diff --git a/configure.ac b/configure.ac index 6b17b68dc0a..58bbe448e53 100644 --- a/configure.ac +++ b/configure.ac @@ -1677,10 +1677,10 @@ fi if test "x$with_ppl" != xno; then if test "x$pwllib" = x; then - saved_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $ppllibs" - AC_CHECK_LIB(pwl,PWL_handle_timeout,[pwllib="-lpwl"]) - LDFLAGS="$saved_LDFLAGS" + saved_LIBS="$LIBS" + LIBS="$LIBS $ppllibs -lstdc++ -lm" + AC_CHECK_LIB(pwl, PWL_handle_timeout, [pwllib="-lpwl"]) + LIBS="$saved_LIBS" fi ppllibs="$ppllibs -lppl_c -lppl $pwllib -lgmpxx" -- 2.30.2