public inbox for newlib-cvs@sourceware.org
help / color / mirror / Atom feed
From: Michael Frysinger <vapier@sourceware.org>
To: newlib-cvs@sourceware.org
Subject: [newlib-cygwin] newlib: libm: fix rebase conflicts
Date: Thu, 10 Feb 2022 05:37:46 +0000 (GMT)	[thread overview]
Message-ID: <20220210053746.CBA353858D1E@sourceware.org> (raw)

https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=e95c80b6d82b5f5aca578ae131faa6b7df965020

commit e95c80b6d82b5f5aca578ae131faa6b7df965020
Author: Mike Frysinger <vapier@gentoo.org>
Date:   Thu Feb 10 00:36:34 2022 -0500

    newlib: libm: fix rebase conflicts
    
    I missed this cleanup when rebasing on top of the latest branch.

Diff:
---
 newlib/configure         | 6 +-----
 newlib/libm/acinclude.m4 | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/newlib/configure b/newlib/configure
index aefb8c03a..aa944d2c2 100755
--- a/newlib/configure
+++ b/newlib/configure
@@ -4823,11 +4823,7 @@ if test -n "${libm_machine_dir}"; then
   esac
 
   LIBM_MACHINE_DIR=machine/${libm_machine_dir}
-  if test "${use_libtool}" = "yes"; then
-    LIBM_MACHINE_LIB=${LIBM_MACHINE_DIR}/lib${libm_machine_dir}.${aext}
-  else
-    LIBM_MACHINE_LIB=${LIBM_MACHINE_DIR}/lib.${aext}
-  fi
+  LIBM_MACHINE_LIB=${LIBM_MACHINE_DIR}/lib.a
 fi
  if test "x${LIBM_MACHINE_DIR}" != x; then
   HAVE_LIBM_MACHINE_DIR_TRUE=
diff --git a/newlib/libm/acinclude.m4 b/newlib/libm/acinclude.m4
index 25054dc8c..6b59715fc 100644
--- a/newlib/libm/acinclude.m4
+++ b/newlib/libm/acinclude.m4
@@ -20,11 +20,7 @@ if test -n "${libm_machine_dir}"; then
   esac
 
   LIBM_MACHINE_DIR=machine/${libm_machine_dir}
-  if test "${use_libtool}" = "yes"; then
-    LIBM_MACHINE_LIB=${LIBM_MACHINE_DIR}/lib${libm_machine_dir}.${aext}
-  else
-    LIBM_MACHINE_LIB=${LIBM_MACHINE_DIR}/lib.${aext}
-  fi
+  LIBM_MACHINE_LIB=${LIBM_MACHINE_DIR}/lib.a
 fi
 AM_CONDITIONAL(HAVE_LIBM_MACHINE_DIR, test "x${LIBM_MACHINE_DIR}" != x)
 AC_SUBST(LIBM_MACHINE_DIR)


                 reply	other threads:[~2022-02-10  5:37 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220210053746.CBA353858D1E@sourceware.org \
    --to=vapier@sourceware.org \
    --cc=newlib-cvs@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).