drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

newlib: libm: fix rebase conflicts 

I missed this cleanup when rebasing on top of the latest branch.
This commit is contained in:
Mike Frysinger 2022-02-10 00:36:34 -05:00
parent e114cbc6e1
commit e95c80b6d8
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
newlib/configure vendored
View File

@ -4823,11 +4823,7 @@ if test -n "${libm_machine_dir}"; then
esac esac
LIBM_MACHINE_DIR=machine/${libm_machine_dir} LIBM_MACHINE_DIR=machine/${libm_machine_dir}
if test "${use_libtool}" = "yes"; then LIBM_MACHINE_LIB=${LIBM_MACHINE_DIR}/lib.a
LIBM_MACHINE_LIB=${LIBM_MACHINE_DIR}/lib${libm_machine_dir}.${aext}
else
LIBM_MACHINE_LIB=${LIBM_MACHINE_DIR}/lib.${aext}
fi
fi fi
if test "x${LIBM_MACHINE_DIR}" != x; then if test "x${LIBM_MACHINE_DIR}" != x; then
HAVE_LIBM_MACHINE_DIR_TRUE= HAVE_LIBM_MACHINE_DIR_TRUE=

6
newlib/libm/acinclude.m4
View File

@ -20,11 +20,7 @@ if test -n "${libm_machine_dir}"; then
esac esac
LIBM_MACHINE_DIR=machine/${libm_machine_dir} LIBM_MACHINE_DIR=machine/${libm_machine_dir}
if test "${use_libtool}" = "yes"; then LIBM_MACHINE_LIB=${LIBM_MACHINE_DIR}/lib.a
LIBM_MACHINE_LIB=${LIBM_MACHINE_DIR}/lib${libm_machine_dir}.${aext}
else
LIBM_MACHINE_LIB=${LIBM_MACHINE_DIR}/lib.${aext}
fi
fi fi
AM_CONDITIONAL(HAVE_LIBM_MACHINE_DIR, test "x${LIBM_MACHINE_DIR}" != x) AM_CONDITIONAL(HAVE_LIBM_MACHINE_DIR, test "x${LIBM_MACHINE_DIR}" != x)
AC_SUBST(LIBM_MACHINE_DIR) AC_SUBST(LIBM_MACHINE_DIR)