diff --git a/newlib/ChangeLog b/newlib/ChangeLog index a14669c0b..e136405bf 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,9 @@ +2001-08-29 Jeff Johnston + + * Makefile.am: Add check for ln failing when creating libg.a + so that cp gets used as a backup. + * Makefile.in: Regenerated. + 2001-08-29 Jeff Johnston * libc/include/sys/reent.h: Add include of . diff --git a/newlib/Makefile.am b/newlib/Makefile.am index 5e7c0fcd4..b00d9265b 100644 --- a/newlib/Makefile.am +++ b/newlib/Makefile.am @@ -81,7 +81,7 @@ libc.a: libc/libc.a libm.a $(AR) x ../libc/libc.a ; \ $(AR) $(AR_FLAGS) ../$@ *.o $(RANLIB) libc.a - ln libc.a libg.a + ln libc.a libg.a >/dev/null 2>/dev/null || cp libc.a libg.a rm -rf tmp libc/libc.a: ; @true @@ -128,7 +128,7 @@ CLEANFILES = targ-include stmp-targ-include install-data-local: install-toollibLIBRARIES rm -f $(DESTDIR)$(toollibdir)/libg.a - ln $(DESTDIR)$(toollibdir)/libc.a $(DESTDIR)$(toollibdir)/libg.a + ln $(DESTDIR)$(toollibdir)/libc.a $(DESTDIR)$(toollibdir)/libg.a >/dev/null 2>/dev/null || cp $(DESTDIR)$(toollibdir)/libc.a $(DESTDIR)$(toollibdir)/libg.a $(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do -if [ -z "$(MULTISUBDIR)" ]; then \ $(mkinstalldirs) $(DESTDIR)$(tooldir)/include; \ diff --git a/newlib/Makefile.in b/newlib/Makefile.in index 2ed1c5b7e..7284d1ef5 100644 --- a/newlib/Makefile.in +++ b/newlib/Makefile.in @@ -516,7 +516,7 @@ libc.a: libc/libc.a libm.a $(AR) x ../libc/libc.a ; \ $(AR) $(AR_FLAGS) ../$@ *.o $(RANLIB) libc.a - ln libc.a libg.a + ln libc.a libg.a >/dev/null 2>/dev/null || cp libc.a libg.a rm -rf tmp libc/libc.a: ; @true @@ -561,7 +561,7 @@ stmp-targ-include: config.status install-data-local: install-toollibLIBRARIES rm -f $(DESTDIR)$(toollibdir)/libg.a - ln $(DESTDIR)$(toollibdir)/libc.a $(DESTDIR)$(toollibdir)/libg.a + ln $(DESTDIR)$(toollibdir)/libc.a $(DESTDIR)$(toollibdir)/libg.a >/dev/null 2>/dev/null || cp $(DESTDIR)$(toollibdir)/libc.a $(DESTDIR)$(toollibdir)/libg.a $(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do -if [ -z "$(MULTISUBDIR)" ]; then \ $(mkinstalldirs) $(DESTDIR)$(tooldir)/include; \