Gentoo Archives: gentoo-commits

From: "Anthony G. Basile" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/hardened-dev:master commit in: eclass/
Date: Sun, 01 May 2016 19:51:29
Message-Id: 1462132306.c5c2daa6ff0970a37747c58328df38b4ce57207f.blueness@gentoo
1 commit: c5c2daa6ff0970a37747c58328df38b4ce57207f
2 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
3 AuthorDate: Sun May 1 19:51:05 2016 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Sun May 1 19:51:46 2016 +0000
6 URL: https://gitweb.gentoo.org/proj/hardened-dev.git/commit/?id=c5c2daa6
7
8 toolchain.eclass: sanely check if there are spec files to be installed
9
10 eclass/toolchain.eclass | 6 +++++-
11 1 file changed, 5 insertions(+), 1 deletion(-)
12
13 diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
14 index 247dcee..40b2cf9 100644
15 --- a/eclass/toolchain.eclass
16 +++ b/eclass/toolchain.eclass
17 @@ -1954,7 +1954,11 @@ copy_minispecs_gcc_specs() {
18 fi
19 create_gcc_env_entry vanilla
20 insinto ${LIBPATH}
21 - doins "${WORKDIR}"/specs/*.specs || die "failed to install specs"
22 + # Only doins if there are actually spec files in "${WORKDIR}"/specs/
23 + local SPECSDIR="${WORKDIR}"/specs/
24 + if [[ "$(ls -A ${SPECSDIR})" ]]; then
25 + doins "${SPECSDIR}"/*.specs || die "failed to install specs"
26 + fi
27 # Build system specs file which, if it exists, must be a complete set of
28 # specs as it completely and unconditionally overrides the builtin specs.
29 if ! tc_version_is_at_least 4.4 ; then