dev-lang/gnat-gpl: do not depend on CHOST when rm ld

Closes: https://bugs.gentoo.org/717298
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Alfredo Tupone <tupone@gentoo.org>

diff --git a/dev-lang/gnat-gpl/gnat-gpl-2016-r4.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2016-r4.ebuild
index b10bbb93de4e79161e425f05038b6e40a0fda8a3..eeeeaf2c03885387835a0961cdaf0c29f62e6829 100644 (file)
--- a/dev-lang/gnat-gpl/gnat-gpl-2016-r4.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2016-r4.ebuild
@@ -103,7 +103,7 @@ src_unpack() {
 
        toolchain_src_unpack
        if use bootstrap; then
-               rm ${BTSTRP}/libexec/gcc/${CHOST}/4.7.4/ld || die
+               rm ${BTSTRP}/libexec/gcc/*/4.7.4/ld || die
        fi
 }
 

diff --git a/dev-lang/gnat-gpl/gnat-gpl-2017-r1.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2017-r1.ebuild
index a0efa9b463c10521c33ac1623cc38d8cf9f9ab78..4e65591d29ce3b5e746f78e46d6d5cc59defa9b3 100644 (file)
--- a/dev-lang/gnat-gpl/gnat-gpl-2017-r1.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2017-r1.ebuild
@@ -85,7 +85,7 @@ src_unpack() {
 
        toolchain_src_unpack
        if use bootstrap; then
-               rm ${BTSTRP}/libexec/gcc/${CHOST}/4.7.4/ld || die
+               rm ${BTSTRP}/libexec/gcc/*/4.7.4/ld || die
        fi
 }
 

diff --git a/dev-lang/gnat-gpl/gnat-gpl-2018-r3.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2018-r3.ebuild
index 239c00d759dae4fb716fe140ba6b95b1b01197b8..7dbb27439ea7180931736b977cd845ac44157b0f 100644 (file)
--- a/dev-lang/gnat-gpl/gnat-gpl-2018-r3.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2018-r3.ebuild
@@ -84,7 +84,7 @@ src_unpack() {
 
        toolchain_src_unpack
        if use bootstrap; then
-               rm ${BTSTRP}/libexec/gcc/${CHOST}/4.7.4/ld || die
+               rm ${BTSTRP}/libexec/gcc/*/4.7.4/ld || die
        fi
 }
 

diff --git a/dev-lang/gnat-gpl/gnat-gpl-2019-r1.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2019-r1.ebuild
index 34a131541eaa11cf431e42d852b36f91493906de..6f1e39dc569f563212d9930c6ff99fa35324b76f 100644 (file)
--- a/dev-lang/gnat-gpl/gnat-gpl-2019-r1.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2019-r1.ebuild
@@ -86,7 +86,7 @@ src_unpack() {
 
        toolchain_src_unpack
        if use bootstrap; then
-               rm ${BTSTRP}/libexec/gcc/${CHOST}/4.7.4/ld || die
+               rm ${BTSTRP}/libexec/gcc/*/4.7.4/ld || die
        fi
 }
 

diff --git a/dev-lang/gnat-gpl/gnat-gpl-2019-r2.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2019-r2.ebuild
index d77a6a4f0088f767e7dedbb5919cb3d4140d9075..f6f02fcd579abbadedfbf38cbe558c01208bf6e6 100644 (file)
--- a/dev-lang/gnat-gpl/gnat-gpl-2019-r2.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2019-r2.ebuild
@@ -86,7 +86,7 @@ src_unpack() {
 
        toolchain_src_unpack
        if use bootstrap; then
-               rm ${BTSTRP}/libexec/gcc/${CHOST}/4.7.4/ld || die
+               rm ${BTSTRP}/libexec/gcc/*/4.7.4/ld || die
        fi
 }