| 1 |
commit: 4af87d4e5c25ed7f22988a4f442482b81b1ab47f |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 30 01:43:12 2023 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 30 17:37:07 2023 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4af87d4e |
| 7 |
|
| 8 |
toolchain-funcs.eclass: style tweaks |
| 9 |
|
| 10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 11 |
|
| 12 |
eclass/toolchain-funcs.eclass | 26 +++++++++++++------------- |
| 13 |
1 file changed, 13 insertions(+), 13 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/toolchain-funcs.eclass b/eclass/toolchain-funcs.eclass |
| 16 |
index 840111f6cc30..9bb660e4f71f 100644 |
| 17 |
--- a/eclass/toolchain-funcs.eclass |
| 18 |
+++ b/eclass/toolchain-funcs.eclass |
| 19 |
@@ -422,19 +422,19 @@ tc-env_build() { |
| 20 |
# src_configure() { |
| 21 |
# ECONF_SOURCE=${S} |
| 22 |
# if tc-is-cross-compiler ; then |
| 23 |
-# mkdir "${WORKDIR}"/${CBUILD} |
| 24 |
-# pushd "${WORKDIR}"/${CBUILD} >/dev/null |
| 25 |
+# mkdir "${WORKDIR}"/${CBUILD} || die |
| 26 |
+# pushd "${WORKDIR}"/${CBUILD} >/dev/null || die |
| 27 |
# econf_build --disable-some-unused-stuff |
| 28 |
-# popd >/dev/null |
| 29 |
+# popd >/dev/null || die |
| 30 |
# fi |
| 31 |
# ... normal build paths ... |
| 32 |
# } |
| 33 |
# src_compile() { |
| 34 |
# if tc-is-cross-compiler ; then |
| 35 |
-# pushd "${WORKDIR}"/${CBUILD} >/dev/null |
| 36 |
+# pushd "${WORKDIR}"/${CBUILD} >/dev/null || die |
| 37 |
# emake one-or-two-build-tools |
| 38 |
-# ln/mv build-tools to normal build paths in ${S}/ |
| 39 |
-# popd >/dev/null |
| 40 |
+# ln/mv build-tools to normal build paths in ${S}/ || die |
| 41 |
+# popd >/dev/null || die |
| 42 |
# fi |
| 43 |
# ... normal build paths ... |
| 44 |
# } |
| 45 |
@@ -676,7 +676,7 @@ tc-has-tls() { |
| 46 |
# Parse information from CBUILD/CHOST/CTARGET rather than |
| 47 |
# use external variables from the profile. |
| 48 |
tc-ninja_magic_to_arch() { |
| 49 |
-ninj() { [[ ${type} == "kern" ]] && echo $1 || echo $2 ; } |
| 50 |
+ ninj() { [[ ${type} == "kern" ]] && echo $1 || echo $2 ; } |
| 51 |
|
| 52 |
local type=$1 |
| 53 |
local host=$2 |
| 54 |
@@ -815,8 +815,8 @@ tc-get-compiler-type() { |
| 55 |
case ${res} in |
| 56 |
*HAVE_PATHCC*) echo pathcc;; |
| 57 |
*HAVE_CLANG*) echo clang;; |
| 58 |
- *HAVE_GCC*) echo gcc;; |
| 59 |
- *) echo unknown;; |
| 60 |
+ *HAVE_GCC*) echo gcc;; |
| 61 |
+ *) echo unknown;; |
| 62 |
esac |
| 63 |
} |
| 64 |
|
| 65 |
@@ -834,11 +834,11 @@ tc-is-clang() { |
| 66 |
|
| 67 |
# Internal func. The first argument is the version info to expand. |
| 68 |
# Query the preprocessor to improve compatibility across different |
| 69 |
-# compilers rather than maintaining a --version flag matrix. #335943 |
| 70 |
+# compilers rather than maintaining a --version flag matrix, bug #335943. |
| 71 |
_gcc_fullversion() { |
| 72 |
local ver="$1"; shift |
| 73 |
set -- $($(tc-getCPP "$@") -E -P - <<<"__GNUC__ __GNUC_MINOR__ __GNUC_PATCHLEVEL__") |
| 74 |
- eval echo "$ver" |
| 75 |
+ eval echo "${ver}" |
| 76 |
} |
| 77 |
|
| 78 |
# @FUNCTION: gcc-fullversion |
| 79 |
@@ -871,7 +871,7 @@ gcc-micro-version() { |
| 80 |
_clang_fullversion() { |
| 81 |
local ver="$1"; shift |
| 82 |
set -- $($(tc-getCPP "$@") -E -P - <<<"__clang_major__ __clang_minor__ __clang_patchlevel__") |
| 83 |
- eval echo "$ver" |
| 84 |
+ eval echo "${ver}" |
| 85 |
} |
| 86 |
|
| 87 |
# @FUNCTION: clang-fullversion |
| 88 |
@@ -1098,7 +1098,7 @@ gen_usr_ldscript() { |
| 89 |
# is referenced ... makes multilib saner |
| 90 |
local flags=( ${CFLAGS} ${LDFLAGS} -Wl,--verbose ) |
| 91 |
if $(tc-getLD) --version | grep -q 'GNU gold' ; then |
| 92 |
- # If they're using gold, manually invoke the old bfd. #487696 |
| 93 |
+ # If they're using gold, manually invoke the old bfd, bug #487696 |
| 94 |
local d="${T}/bfd-linker" |
| 95 |
mkdir -p "${d}" |
| 96 |
ln -sf $(type -P ${CHOST}-ld.bfd) "${d}"/ld |
Archives