diff options
| author | Richard Biener <rguenther@suse.de> | 2023-01-23 11:43:53 +0100 |
|---|---|---|
| committer | Richard Biener <rguenther@suse.de> | 2023-01-31 15:54:17 +0100 |
| commit | 7f583a335769591d016caa51490e3e5dd50354fe (patch) | |
| tree | 64319f196715c6c7d05fa5f053cb4acb50cce352 /libgm2/libm2iso | |
| parent | 50335ddd301404e9053786b26a23a924471b4d09 (diff) | |
| download | gcc-7f583a335769591d016caa51490e3e5dd50354fe.zip gcc-7f583a335769591d016caa51490e3e5dd50354fe.tar.gz gcc-7f583a335769591d016caa51490e3e5dd50354fe.tar.bz2 | |
modula2/108462 - duplicate install of static modula2 target libs
The following addresses the fact that libgm2 installs static libraries
into two places, one performed by
toolexeclib_LTLIBRARIES = libm2cor.la
and one performed as part of the install-data-local rule to a
m2/m2cor subdirectory alongside Modula-2 .def and .mod files.
This patch opts to keep the copy installed by libtool and removes
the extra installs in the install-data-local rules.
I've built and installed both with and without
--enable-version-specific-runtime-libs and compiled and linked
a Modula-2 testcase with the installed compiler with the two
multilibs and with and without static successfully.
PR modula2/108462
libgm2/
* libm2cor/Makefile.am: Remove static lib install from
install-data-local.
* libm2iso/Makefile.am: Likewise.
* libm2log/Makefile.am: Likewise.
* libm2min/Makefile.am: Likewise.
* libm2pim/Makefile.am: Likewise.
* libm2cor/Makefile.in: Regenerate.
* libm2iso/Makefile.in: Likewise.
* libm2log/Makefile.in: Likewise.
* libm2min/Makefile.in: Likewise.
* libm2pim/Makefile.in: Likewise.
Diffstat (limited to 'libgm2/libm2iso')
| -rw-r--r-- | libgm2/libm2iso/Makefile.am | 5 | ||||
| -rw-r--r-- | libgm2/libm2iso/Makefile.in | 5 |
2 files changed, 0 insertions, 10 deletions
diff --git a/libgm2/libm2iso/Makefile.am b/libgm2/libm2iso/Makefile.am index af3728b..843b595 100644 --- a/libgm2/libm2iso/Makefile.am +++ b/libgm2/libm2iso/Makefile.am @@ -220,11 +220,6 @@ SYSTEM.def: Makefile install-data-local: force mkdir -p $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) - $(INSTALL_DATA) .libs/libm2iso.la $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) - chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2iso.la - $(INSTALL_DATA) .libs/libm2iso.a $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) - chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)/libm2iso.a - $(RANLIB) $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)/libm2iso.a for i in $(M2DEFS) $(M2MODS) ; do \ if [ -f $$i ] ; then \ $(INSTALL_DATA) $$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \ diff --git a/libgm2/libm2iso/Makefile.in b/libgm2/libm2iso/Makefile.in index b327cbc..55cafa2 100644 --- a/libgm2/libm2iso/Makefile.in +++ b/libgm2/libm2iso/Makefile.in @@ -919,11 +919,6 @@ uninstall-am: uninstall-toolexeclibLTLIBRARIES @BUILD_ISOLIB_TRUE@install-data-local: force @BUILD_ISOLIB_TRUE@ mkdir -p $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) -@BUILD_ISOLIB_TRUE@ $(INSTALL_DATA) .libs/libm2iso.la $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) -@BUILD_ISOLIB_TRUE@ chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2iso.la -@BUILD_ISOLIB_TRUE@ $(INSTALL_DATA) .libs/libm2iso.a $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) -@BUILD_ISOLIB_TRUE@ chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)/libm2iso.a -@BUILD_ISOLIB_TRUE@ $(RANLIB) $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)/libm2iso.a @BUILD_ISOLIB_TRUE@ for i in $(M2DEFS) $(M2MODS) ; do \ @BUILD_ISOLIB_TRUE@ if [ -f $$i ] ; then \ @BUILD_ISOLIB_TRUE@ $(INSTALL_DATA) $$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \ |