| 1 |
commit: cc875f5163a6e79110e4afcabe07acdacd369bf5 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jul 14 15:00:21 2020 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jul 16 14:29:16 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=cc875f51 |
| 7 |
|
| 8 |
gen_determineargs.sh: determine_real_args(): Don't call gcc directly |
| 9 |
|
| 10 |
Set $CHOST variable via config so that we no longer need to call |
| 11 |
gcc directly to determine CHOST value. |
| 12 |
|
| 13 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 14 |
|
| 15 |
defaults/config.sh | 3 +++ |
| 16 |
gen_determineargs.sh | 13 ++++++------- |
| 17 |
2 files changed, 9 insertions(+), 7 deletions(-) |
| 18 |
|
| 19 |
diff --git a/defaults/config.sh b/defaults/config.sh |
| 20 |
index bab7b7e..f8cb311 100644 |
| 21 |
--- a/defaults/config.sh |
| 22 |
+++ b/defaults/config.sh |
| 23 |
@@ -49,3 +49,6 @@ DEFAULT_UTILS_CC=gcc |
| 24 |
DEFAULT_UTILS_CXX=g++ |
| 25 |
DEFAULT_UTILS_AS=as |
| 26 |
DEFAULT_UTILS_LD=ld |
| 27 |
+ |
| 28 |
+PORTAGE_CHOST="$(portageq envvar CHOST)" |
| 29 |
+DEFAULT_CHOST="${PORTAGE_CHOST:-$(${DEFAULT_UTILS_CC} -dumpmachine 2>/dev/null)}" |
| 30 |
|
| 31 |
diff --git a/gen_determineargs.sh b/gen_determineargs.sh |
| 32 |
index 956e3bf..b464505 100755 |
| 33 |
--- a/gen_determineargs.sh |
| 34 |
+++ b/gen_determineargs.sh |
| 35 |
@@ -300,6 +300,7 @@ determine_real_args() { |
| 36 |
|
| 37 |
set_config_with_override STRING COMPRESS_INITRD CMD_COMPRESS_INITRD "${DEFAULT_COMPRESS_INITRD}" |
| 38 |
set_config_with_override STRING COMPRESS_INITRD_TYPE CMD_COMPRESS_INITRD_TYPE "${DEFAULT_COMPRESS_INITRD_TYPE}" |
| 39 |
+ set_config_with_override STRING CHOST CMD_CHOST "${DEFAULT_CHOST}" |
| 40 |
set_config_with_override STRING MAKEOPTS CMD_MAKEOPTS "${DEFAULT_MAKEOPTS}" |
| 41 |
set_config_with_override STRING NICE CMD_NICE "10" |
| 42 |
set_config_with_override STRING KERNEL_MAKE CMD_KERNEL_MAKE "${DEFAULT_KERNEL_MAKE}" |
| 43 |
@@ -563,17 +564,15 @@ determine_real_args() { |
| 44 |
ARCH_CONFIG="${GK_SHARE}/arch/${ARCH}/config.sh" |
| 45 |
[ -f "${ARCH_CONFIG}" ] || gen_die "${ARCH} not yet supported by genkernel. Please add the arch-specific config file '${ARCH_CONFIG}'!" |
| 46 |
|
| 47 |
- # set CBUILD and CHOST |
| 48 |
- local build_cc=$(tc-getBUILD_CC) |
| 49 |
- CBUILD=$(${build_cc} -dumpmachine 2>/dev/null) |
| 50 |
- if [ -z "${CBUILD}" ] |
| 51 |
+ # Set CBUILD and CHOST |
| 52 |
+ if ! isTrue "$(is_valid_triplet "${CHOST}")" |
| 53 |
then |
| 54 |
- gen_die "Failed to determine CBUILD using '${build_cc} -dumpmachine' command!" |
| 55 |
+ gen_die "Set CHOST '${CHOST}' does NOT represent a valid triplet!" |
| 56 |
else |
| 57 |
+ # Initialize CBUILD with CHOST value |
| 58 |
+ CBUILD=${CHOST} |
| 59 |
print_info 5 "CBUILD set to '${CBUILD}' ..." |
| 60 |
- CHOST="${CBUILD}" |
| 61 |
fi |
| 62 |
- unset build_cc |
| 63 |
|
| 64 |
if [ -n "${CMD_CROSS_COMPILE}" ] |
| 65 |
then |
Archives