[gentoo-commits] repo/gentoo:master commit in: eclass/

[Sam James]

commit:     5e1cfeb86b5561f7ea59a04fa25d677471b49f3f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 21 14:12:46 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Nov 21 14:13:56 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e1cfeb8

toolchain.eclass: handle empty musl 'nocross' patches dir

Signed-off-by: Sam James <sam <AT> gentoo.org>

 eclass/toolchain.eclass | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 627531f2765a..852d65add7c5 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -561,10 +561,16 @@ do_gcc_gentoo_patches() {
                                # We don't want to apply some patches when 
cross-compiling.
                                if [[ -d "${WORKDIR}"/musl/nocross ]] ; then
                                        rm -fv 
"${WORKDIR}"/musl/nocross/*.patch || die
+                               else
+                                       # Just make an empty directory to make 
the glob below easier.
+                                       mkdir -p "${WORKDIR}"/musl/nocross || 
die
                                fi
                        fi
 
+                       local shopt_save=$(shopt -p nullglob)
+                       shopt -s nullglob
                        tc_apply_patches "Applying musl patches ..." 
"${WORKDIR}"/musl/{,nocross/}*.patch
+                       ${shopt_save}
                fi
        fi
 }