| 1 |
commit: 6ea3cd1f1525fdadb9faabfe8183e22b4836acdf |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Aug 27 20:55:56 2020 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Aug 28 13:45:21 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=6ea3cd1f |
| 7 |
|
| 8 |
defaults/config.sh: Add DEFAULT_<TYPE>_<TCVAR> to allow override |
| 9 |
|
| 10 |
_tc-getPROG() can only override variable with user provided value |
| 11 |
when there is a default value. |
| 12 |
|
| 13 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 14 |
|
| 15 |
defaults/config.sh | 26 ++++++++++++++++++++------ |
| 16 |
gen_determineargs.sh | 26 +++++++++++++++++++++----- |
| 17 |
2 files changed, 41 insertions(+), 11 deletions(-) |
| 18 |
|
| 19 |
diff --git a/defaults/config.sh b/defaults/config.sh |
| 20 |
index f8cb311..a5d9ea3 100644 |
| 21 |
--- a/defaults/config.sh |
| 22 |
+++ b/defaults/config.sh |
| 23 |
@@ -37,18 +37,32 @@ DEFAULT_MAKEOPTS="${PORTAGE_MAKEOPTS:- -j$(nproc)}" |
| 24 |
|
| 25 |
DEFAULT_MODULEREBUILD_CMD="emerge --ignore-default-opts --buildpkg=n --usepkg=n --quiet-build=y @module-rebuild" |
| 26 |
|
| 27 |
-DEFAULT_KERNEL_MAKE=make |
| 28 |
-DEFAULT_UTILS_MAKE=make |
| 29 |
- |
| 30 |
-DEFAULT_KERNEL_CC=gcc |
| 31 |
DEFAULT_KERNEL_AS=as |
| 32 |
+DEFAULT_KERNEL_AR=ar |
| 33 |
+DEFAULT_KERNEL_CC=gcc |
| 34 |
+DEFAULT_KERNEL_CXX=g++ |
| 35 |
DEFAULT_KERNEL_LD=ld |
| 36 |
+DEFAULT_KERNEL_NM=nm |
| 37 |
+DEFAULT_KERNEL_MAKE=make |
| 38 |
+DEFAULT_KERNEL_OBJCOPY=objcopy |
| 39 |
+DEFAULT_KERNEL_OBJDUMP=objdump |
| 40 |
+DEFAULT_KERNEL_RANLIB=ranlib |
| 41 |
+DEFAULT_KERNEL_READELF=readelf |
| 42 |
+DEFAULT_KERNEL_STRIP=strip |
| 43 |
|
| 44 |
-DEFAULT_UTILS_CFLAGS="-Os -pipe -fomit-frame-pointer" |
| 45 |
+DEFAULT_UTILS_AS=as |
| 46 |
+DEFAULT_UTILS_AR=ar |
| 47 |
DEFAULT_UTILS_CC=gcc |
| 48 |
+DEFAULT_UTILS_CFLAGS="-Os -pipe -fomit-frame-pointer" |
| 49 |
DEFAULT_UTILS_CXX=g++ |
| 50 |
-DEFAULT_UTILS_AS=as |
| 51 |
DEFAULT_UTILS_LD=ld |
| 52 |
+DEFAULT_UTILS_NM=nm |
| 53 |
+DEFAULT_UTILS_MAKE=make |
| 54 |
+DEFAULT_UTILS_OBJCOPY=objcopy |
| 55 |
+DEFAULT_UTILS_OBJDUMP=objdump |
| 56 |
+DEFAULT_UTILS_RANLIB=ranlib |
| 57 |
+DEFAULT_UTILS_READELF=readelf |
| 58 |
+DEFAULT_UTILS_STRIP=strip |
| 59 |
|
| 60 |
PORTAGE_CHOST="$(portageq envvar CHOST)" |
| 61 |
DEFAULT_CHOST="${PORTAGE_CHOST:-$(${DEFAULT_UTILS_CC} -dumpmachine 2>/dev/null)}" |
| 62 |
|
| 63 |
diff --git a/gen_determineargs.sh b/gen_determineargs.sh |
| 64 |
index 7332bb0..0fe8886 100755 |
| 65 |
--- a/gen_determineargs.sh |
| 66 |
+++ b/gen_determineargs.sh |
| 67 |
@@ -318,16 +318,32 @@ determine_real_args() { |
| 68 |
set_config_with_override STRING CHOST CMD_CHOST "${DEFAULT_CHOST}" |
| 69 |
set_config_with_override STRING MAKEOPTS CMD_MAKEOPTS "${DEFAULT_MAKEOPTS}" |
| 70 |
set_config_with_override STRING NICE CMD_NICE "10" |
| 71 |
- set_config_with_override STRING KERNEL_MAKE CMD_KERNEL_MAKE "${DEFAULT_KERNEL_MAKE}" |
| 72 |
- set_config_with_override STRING UTILS_CFLAGS CMD_UTILS_CFLAGS "${DEFAULT_UTILS_CFLAGS}" |
| 73 |
- set_config_with_override STRING UTILS_MAKE CMD_UTILS_MAKE "${DEFAULT_UTILS_MAKE}" |
| 74 |
+ set_config_with_override STRING KERNEL_AS CMD_KERNEL_AS "${DEFAULT_KERNEL_AS}" |
| 75 |
+ set_config_with_override STRING KERNEL_AR CMD_KERNEL_AR "${DEFAULT_KERNEL_AR}" |
| 76 |
set_config_with_override STRING KERNEL_CC CMD_KERNEL_CC "${DEFAULT_KERNEL_CC}" |
| 77 |
+ set_config_with_override STRING KERNEL_CFLAGS CMD_KERNEL_CFLAGS "${DEFAULT_KERNEL_CFLAGS}" |
| 78 |
+ set_config_with_override STRING KERNEL_CXX CMD_KERNEL_CXX "${DEFAULT_KERNEL_CXX}" |
| 79 |
set_config_with_override STRING KERNEL_LD CMD_KERNEL_LD "${DEFAULT_KERNEL_LD}" |
| 80 |
- set_config_with_override STRING KERNEL_AS CMD_KERNEL_AS "${DEFAULT_KERNEL_AS}" |
| 81 |
+ set_config_with_override STRING KERNEL_NM CMD_KERNEL_NM "${DEFAULT_KERNEL_NM}" |
| 82 |
+ set_config_with_override STRING KERNEL_MAKE CMD_KERNEL_MAKE "${DEFAULT_KERNEL_MAKE}" |
| 83 |
+ set_config_with_override STRING KERNEL_OBJCOPY CMD_KERNEL_OBJCOPY "${DEFAULT_KERNEL_OBJCOPY}" |
| 84 |
+ set_config_with_override STRING KERNEL_OBJDUMP CMD_KERNEL_OBJDUMP "${DEFAULT_KERNEL_OBJDUMP}" |
| 85 |
+ set_config_with_override STRING KERNEL_RANLIB CMD_KERNEL_RANLIB "${DEFAULT_KERNEL_RANLIB}" |
| 86 |
+ set_config_with_override STRING KERNEL_READELF CMD_KERNEL_READELF "${DEFAULT_KERNEL_READELF}" |
| 87 |
+ set_config_with_override STRING KERNEL_STRIP CMD_KERNEL_STRIP "${DEFAULT_KERNEL_STRIP}" |
| 88 |
+ set_config_with_override STRING UTILS_AS CMD_UTILS_AS "${DEFAULT_UTILS_AS}" |
| 89 |
+ set_config_with_override STRING UTILS_AR CMD_UTILS_AR "${DEFAULT_UTILS_AR}" |
| 90 |
set_config_with_override STRING UTILS_CC CMD_UTILS_CC "${DEFAULT_UTILS_CC}" |
| 91 |
+ set_config_with_override STRING UTILS_CFLAGS CMD_UTILS_CFLAGS "${DEFAULT_UTILS_CFLAGS}" |
| 92 |
set_config_with_override STRING UTILS_CXX CMD_UTILS_CXX "${DEFAULT_UTILS_CXX}" |
| 93 |
set_config_with_override STRING UTILS_LD CMD_UTILS_LD "${DEFAULT_UTILS_LD}" |
| 94 |
- set_config_with_override STRING UTILS_AS CMD_UTILS_AS "${DEFAULT_UTILS_AS}" |
| 95 |
+ set_config_with_override STRING UTILS_NM CMD_UTILS_NM "${DEFAULT_UTILS_NM}" |
| 96 |
+ set_config_with_override STRING UTILS_MAKE CMD_UTILS_MAKE "${DEFAULT_UTILS_MAKE}" |
| 97 |
+ set_config_with_override STRING UTILS_OBJCOPY CMD_UTILS_OBJCOPY "${DEFAULT_UTILS_OBJCOPY}" |
| 98 |
+ set_config_with_override STRING UTILS_OBJDUMP CMD_UTILS_OBJDUMP "${DEFAULT_UTILS_OBJDUMP}" |
| 99 |
+ set_config_with_override STRING UTILS_RANLIB CMD_UTILS_RANLIB "${DEFAULT_UTILS_RANLIB}" |
| 100 |
+ set_config_with_override STRING UTILS_READELF CMD_UTILS_READELF "${DEFAULT_UTILS_READELF}" |
| 101 |
+ set_config_with_override STRING UTILS_STRIP CMD_UTILS_STRIP "${DEFAULT_UTILS_STRIP}" |
| 102 |
|
| 103 |
set_config_with_override STRING CROSS_COMPILE CMD_CROSS_COMPILE |
| 104 |
set_config_with_override STRING BOOTDIR CMD_BOOTDIR "/boot" |
Archives