From c37a5b49ca14365cb883d2df027485566041b31c Mon Sep 17 00:00:00 2001
From: Patrick McDermott <patrick.mcdermott@libiquity.com>
Date: Wed, 29 May 2019 09:11:44 -0400
Subject: build, gcc-*-*-*-*: liblto_plugin gets installed under libexecsubdir

---
diff --git a/build b/build
index a97df14..299b291 100755
--- a/build
+++ b/build
@@ -181,6 +181,7 @@ $(install_native_stamps):
 	mv \
 		$(destdir)$(libexecsubdir)/cc1* \
 		$(destdir)$(libexecsubdir)/collect2 \
+		$(destdir)$(libexecsubdir)/*.so* \
 		$(destdir)$(libexecsubdir)/lto* \
 		$(destdir)$(gccexedir)
 	# Start files and gcc libraries:
@@ -188,7 +189,6 @@ $(install_native_stamps):
 	mv \
 		$(destdir)$(libsubdir)/*.o \
 		$(destdir)$(libsubdir)/*.a \
-		$(destdir)$(libsubdir)/*.so* \
 		$(destdir)$(tgtlibdir)
 	# gcc and C++ headers:
 	mkdir -p \
@@ -242,7 +242,7 @@ $(install_native_stamps):
 	rm -f \
 		$(destdir)$(libdir)/*.la \
 		$(destdir)$(libdir)/*.a \
-		$(destdir)$(libsubdir)/*.la \
+		$(destdir)$(libexecsubdir)/*.la \
 		$(destdir)$(libsubdir)/plugin/*.la
 	# Remove the info directory node.
 	rm -f $(destdir)/usr/share/info/dir
@@ -292,14 +292,14 @@ $(install_cross_stamps):
 	mv \
 		$(destdir)$(libexecsubdir)/cc1* \
 		$(destdir)$(libexecsubdir)/collect2 \
+		$(destdir)$(libexecsubdir)/*.la \
+		$(destdir)$(libexecsubdir)/*.so* \
 		$(destdir)$(libexecsubdir)/lto* \
 		$(destdir)$(gccexedir)
 	rm -Rf \
 		$(destdir)$(libsubdir)/*.o \
 		$(destdir)$(libsubdir)/include* \
 		$(destdir)$(libsubdir)/*.a \
-		$(destdir)$(libsubdir)/*.la \
-		$(destdir)$(libsubdir)/*.so* \
 		$(destdir)$(libsubdir)/install-tools \
 		$(destdir)$(libexecsubdir)/install-tools \
 		$(destdir)$(libsubdir)/plugin \
diff --git a/gcc.pkg.in/files b/gcc.pkg.in/files
index 48132bd..3d185ab 100644
--- a/gcc.pkg.in/files
+++ b/gcc.pkg.in/files
@@ -1,10 +1,10 @@
 /usr/bin/*gcc-*
 /usr/bin/*gcov-*
 /usr/libexec/gcc/*/*/collect2
+/usr/libexec/gcc/*/*/liblto_plugin.so*
 /usr/libexec/gcc/*/*/lto-wrapper
 /usr/libexec/gcc/*/*/lto1
 /usr/lib/*/gcc/*/*.o
 /usr/lib/*/gcc/*/include-fixed/
 /usr/lib/*/gcc/*/include/
 /usr/lib/*/gcc/*/*.a
-/usr/lib/*/gcc/*/liblto_plugin.so*
--
cgit v0.9.1