diff options
| author | Richard Biener <rguenther@suse.de> | 2023-01-23 11:14:05 +0100 |
|---|---|---|
| committer | Richard Biener <rguenther@suse.de> | 2023-01-23 11:19:00 +0100 |
| commit | 47465fff9738b08796f4b52570fec49bbdbf3e57 (patch) | |
| tree | 295eea201a25be11430b3167ef3da88f83e8a2cb /libgm2/libm2pim | |
| parent | 20552407ae11b61fccb46b3e96a8814e790254e7 (diff) | |
| download | gcc-47465fff9738b08796f4b52570fec49bbdbf3e57.zip gcc-47465fff9738b08796f4b52570fec49bbdbf3e57.tar.gz gcc-47465fff9738b08796f4b52570fec49bbdbf3e57.tar.bz2 | |
modula2/108144 - fix mistake in previous change
The previous change to avoid a duplicate multi directory
caused the m2/m2{cor,iso,log,min,pim} installs to happen
relative to the main library directory when not using
--enable-version-specific-runtime-libs which doesn't match
the drivers expectation where to find them. The following
fixes the original issue by simply dropping the duplicate
multi directory since the one in the $(inst_libdir) variable
now works.
Tested by building and installing with and without
--enable-version-specific-runtime-libs and compiling and
linking a modula-2 testcase successfully with the installed
compilers.
PR modula2/108144
libgm2/
* libm2cor/Makefile.am: Revert previous change, instead
drop the redundant $(MULTIDIR).
* 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/libm2pim')
| -rw-r--r-- | libgm2/libm2pim/Makefile.am | 16 | ||||
| -rw-r--r-- | libgm2/libm2pim/Makefile.in | 16 |
2 files changed, 16 insertions, 16 deletions
diff --git a/libgm2/libm2pim/Makefile.am b/libgm2/libm2pim/Makefile.am index f860a7d..35fefae 100644 --- a/libgm2/libm2pim/Makefile.am +++ b/libgm2/libm2pim/Makefile.am @@ -192,20 +192,20 @@ SYSTEM.def: Makefile $(LIBTOOL) --tag=CXX --mode=compile $(CXX) -c -I$(srcdir) $(CXXFLAGS) $(LIBCFLAGS) $(libm2pim_la_CFLAGS) $< -o $@ install-data-local: force - mkdir -p $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR) - $(INSTALL_DATA) .libs/libm2pim.la $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR) - chmod 644 $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)libm2pim.la - $(INSTALL_DATA) .libs/libm2pim.a $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR) - $(RANLIB) $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)libm2pim.a + mkdir -p $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) + $(INSTALL_DATA) .libs/libm2pim.la $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) + chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2pim.la + $(INSTALL_DATA) .libs/libm2pim.a $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) + $(RANLIB) $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2pim.a for i in $(M2DEFS) $(M2MODS) ; do \ if [ -f $$i ] ; then \ - $(INSTALL_DATA) $$i '$(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)'; \ + $(INSTALL_DATA) $$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \ elif [ -f @srcdir@/../../gcc/m2/gm2-libs/$$i ] ; then \ - $(INSTALL_DATA) @srcdir@/../../gcc/m2/gm2-libs/$$i '$(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)'; \ + $(INSTALL_DATA) @srcdir@/../../gcc/m2/gm2-libs/$$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \ else \ echo "cannot find $$i" ; exit 1 ; \ fi ; \ - chmod 644 $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)$$i ; \ + chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)$$i ; \ done force: diff --git a/libgm2/libm2pim/Makefile.in b/libgm2/libm2pim/Makefile.in index a46b5ff..85754b6 100644 --- a/libgm2/libm2pim/Makefile.in +++ b/libgm2/libm2pim/Makefile.in @@ -892,20 +892,20 @@ uninstall-am: uninstall-toolexeclibLTLIBRARIES @BUILD_PIMLIB_TRUE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) -c -I$(srcdir) $(CXXFLAGS) $(LIBCFLAGS) $(libm2pim_la_CFLAGS) $< -o $@ @BUILD_PIMLIB_TRUE@install-data-local: force -@BUILD_PIMLIB_TRUE@ mkdir -p $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR) -@BUILD_PIMLIB_TRUE@ $(INSTALL_DATA) .libs/libm2pim.la $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR) -@BUILD_PIMLIB_TRUE@ chmod 644 $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)libm2pim.la -@BUILD_PIMLIB_TRUE@ $(INSTALL_DATA) .libs/libm2pim.a $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR) -@BUILD_PIMLIB_TRUE@ $(RANLIB) $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)libm2pim.a +@BUILD_PIMLIB_TRUE@ mkdir -p $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) +@BUILD_PIMLIB_TRUE@ $(INSTALL_DATA) .libs/libm2pim.la $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) +@BUILD_PIMLIB_TRUE@ chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2pim.la +@BUILD_PIMLIB_TRUE@ $(INSTALL_DATA) .libs/libm2pim.a $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) +@BUILD_PIMLIB_TRUE@ $(RANLIB) $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2pim.a @BUILD_PIMLIB_TRUE@ for i in $(M2DEFS) $(M2MODS) ; do \ @BUILD_PIMLIB_TRUE@ if [ -f $$i ] ; then \ -@BUILD_PIMLIB_TRUE@ $(INSTALL_DATA) $$i '$(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)'; \ +@BUILD_PIMLIB_TRUE@ $(INSTALL_DATA) $$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \ @BUILD_PIMLIB_TRUE@ elif [ -f @srcdir@/../../gcc/m2/gm2-libs/$$i ] ; then \ -@BUILD_PIMLIB_TRUE@ $(INSTALL_DATA) @srcdir@/../../gcc/m2/gm2-libs/$$i '$(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)'; \ +@BUILD_PIMLIB_TRUE@ $(INSTALL_DATA) @srcdir@/../../gcc/m2/gm2-libs/$$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \ @BUILD_PIMLIB_TRUE@ else \ @BUILD_PIMLIB_TRUE@ echo "cannot find $$i" ; exit 1 ; \ @BUILD_PIMLIB_TRUE@ fi ; \ -@BUILD_PIMLIB_TRUE@ chmod 644 $(DESTDIR)$(toolexeclibdir)$(M2LIBDIR)$$i ; \ +@BUILD_PIMLIB_TRUE@ chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)$$i ; \ @BUILD_PIMLIB_TRUE@ done @BUILD_PIMLIB_TRUE@force: |