libstdc++: Fix installation of python hooks [PR 99453]
authorJonathan Wakely <jwakely@redhat.com>
Tue, 1 Jun 2021 10:00:16 +0000 (11:00 +0100)
committerJonathan Wakely <jwakely@redhat.com>
Tue, 1 Jun 2021 12:29:34 +0000 (13:29 +0100)
When no shared library is installed, the new code to determine the name
of the -gdb.py file yields an empty string. Use the name of the static
library in that case.

libstdc++-v3/ChangeLog:

PR libstdc++/99453
* python/Makefile.am: Use archive name for printer hook if no
dynamic library name is available.
* python/Makefile.in: Regenerate.

libstdc++-v3/python/Makefile.am
libstdc++-v3/python/Makefile.in

index 0c2b207..8efefa5 100644 (file)
@@ -48,5 +48,9 @@ install-data-local: gdb.py
 ## the correct name.
        @libname=`sed -ne "/^library_names=/{s/.*='//;s/'$$//;s/ .*//;p;}" \
                  $(DESTDIR)$(toolexeclibdir)/libstdc++.la`; \
+       if [ -z "$$libname" ]; then \
+         libname=`sed -ne "/^old_library=/{s/.*='//;s/'$$//;s/ .*//;p;}" \
+                 $(DESTDIR)$(toolexeclibdir)/libstdc++.la`; \
+       fi; \
        echo " $(INSTALL_DATA) gdb.py $(DESTDIR)$(toolexeclibdir)/$$libname-gdb.py"; \
        $(INSTALL_DATA) gdb.py $(DESTDIR)$(toolexeclibdir)/$$libname-gdb.py
index 2efe0b9..9904a91 100644 (file)
@@ -609,6 +609,10 @@ install-data-local: gdb.py
        @$(mkdir_p) $(DESTDIR)$(toolexeclibdir)
        @libname=`sed -ne "/^library_names=/{s/.*='//;s/'$$//;s/ .*//;p;}" \
                  $(DESTDIR)$(toolexeclibdir)/libstdc++.la`; \
+       if [ -z "$$libname" ]; then \
+         libname=`sed -ne "/^old_library=/{s/.*='//;s/'$$//;s/ .*//;p;}" \
+                 $(DESTDIR)$(toolexeclibdir)/libstdc++.la`; \
+       fi; \
        echo " $(INSTALL_DATA) gdb.py $(DESTDIR)$(toolexeclibdir)/$$libname-gdb.py"; \
        $(INSTALL_DATA) gdb.py $(DESTDIR)$(toolexeclibdir)/$$libname-gdb.py