diff options
author | Mike Frysinger <vapier@gentoo.org> | 2022-02-10 00:36:34 -0500 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2022-02-10 00:36:34 -0500 |
commit | e95c80b6d82b5f5aca578ae131faa6b7df965020 (patch) | |
tree | a420302590bba0c31bc9ee64da92d22c0cf7616b /newlib | |
parent | e114cbc6e1765a5a0b53921fe09948a2b4031dee (diff) | |
download | newlib-e95c80b6d82b5f5aca578ae131faa6b7df965020.zip newlib-e95c80b6d82b5f5aca578ae131faa6b7df965020.tar.gz newlib-e95c80b6d82b5f5aca578ae131faa6b7df965020.tar.bz2 |
newlib: libm: fix rebase conflicts
I missed this cleanup when rebasing on top of the latest branch.
Diffstat (limited to 'newlib')
-rwxr-xr-x | newlib/configure | 6 | ||||
-rw-r--r-- | newlib/libm/acinclude.m4 | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/newlib/configure b/newlib/configure index aefb8c0..aa944d2 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 25054dc..6b59715 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) |