On Thu, Aug 19, 2021 at 10:10 PM Iain Sandoe <i...@sandoe.co.uk> wrote: > > Hi, > > A while ago had a report of build failure against a Darwin branch on > the latest OS release. This was because (temporarily) the symlink > from libm.dylib => libSystem.dylib had been removed/omitted. > > libm is not needed on Darwin, and should not be added unconditionally > even if that is (mostly) harmless since it is a symlink to libc. > > There could be cases where the addition was not completely harmless > because the presentation of the symlink would cause the symbols exposed > in libSystem to be considered ahead of ones presented in convenience > libraries. > > tested on x86_64, i686-darwin, x86_64-linux, > OK for master?
OK. Richard. > thanks > Iain > > libgfortran/ChangeLog: > > * Makefile.am: Use configured libm availability. > * Makefile.in: Regenerate. > * configure: Regenerate. > * configure.ac: Use libtool macro to find libm availability. > * libgfortran.spec.in: Use configured libm availability. > --- > libgfortran/Makefile.am | 2 +- > libgfortran/Makefile.in | 3 +- > libgfortran/configure | 142 ++++++++++++++++++++++++++++++++ > libgfortran/configure.ac | 1 + > libgfortran/libgfortran.spec.in | 2 +- > 5 files changed, 147 insertions(+), 3 deletions(-) > > diff --git a/libgfortran/Makefile.am b/libgfortran/Makefile.am > index 8d104321567..6fc4b465c6e 100644 > --- a/libgfortran/Makefile.am > +++ b/libgfortran/Makefile.am > @@ -42,7 +42,7 @@ libgfortran_la_LINK = $(LINK) $(libgfortran_la_LDFLAGS) > libgfortran_la_LDFLAGS = -version-info `grep -v '^\#' > $(srcdir)/libtool-version` \ > $(LTLDFLAGS) $(LIBQUADLIB) ../libbacktrace/libbacktrace.la \ > $(HWCAP_LDFLAGS) \ > - -lm $(extra_ldflags_libgfortran) \ > + $(LIBM) $(extra_ldflags_libgfortran) \ > $(version_arg) -Wc,-shared-libgcc > libgfortran_la_DEPENDENCIES = $(version_dep) libgfortran.spec > $(LIBQUADLIB_DEP) > > diff --git a/libgfortran/configure.ac b/libgfortran/configure.ac > index 523eb24bca1..513fd80b936 100644 > --- a/libgfortran/configure.ac > +++ b/libgfortran/configure.ac > @@ -260,6 +260,7 @@ AC_PROG_INSTALL > #AC_MSG_NOTICE([====== Starting libtool configuration]) > AC_LIBTOOL_DLOPEN > AM_PROG_LIBTOOL > +AC_CHECK_LIBM > ACX_LT_HOST_FLAGS > AC_SUBST(enable_shared) > AC_SUBST(enable_static) > diff --git a/libgfortran/libgfortran.spec.in b/libgfortran/libgfortran.spec.in > index 95aa3f842a3..b870e78c151 100644 > --- a/libgfortran/libgfortran.spec.in > +++ b/libgfortran/libgfortran.spec.in > @@ -5,4 +5,4 @@ > # > > %rename lib liborig > -*lib: @LIBQUADSPEC@ -lm %(libgcc) %(liborig) > +*lib: @LIBQUADSPEC@ @LIBM@ %(libgcc) %(liborig) > -- > 2.24.3 (Apple Git-128) > >