diff options
author | Eizan Miyamoto <eizan@chromium.org> | 2021-06-29 14:20:27 +1000 |
---|---|---|
committer | Lukasz Majczak <lmajczak@google.com> | 2021-07-29 11:02:43 +0200 |
commit | 339643a47c4f188de946c338cdfe0a9a931bab7d (patch) | |
tree | f693be4478e629e5804d90b372e9f1ba6c5ae2e8 | |
parent | 92685d10e46185db734473f7d7ef9eab6370c126 (diff) |
CHROMIUM: kernelconfig sets CROSS_COMPILEcros-kernel-v5.14-rc3
Without this, when rebuilding kernel config for aarch64 in
chromeos-kernel-upstream, as-version.sh is run with the following args:
as-version.sh aarch64-cros-linux-gnu-clang -no-integrated-as \
--prefix=/usr/bin/ -Werror=unknown-warning-option
and the following line fails:
set -- $(LC_ALL=C "$@" -Wa,--version -c -x assembler /dev/null \
-o /dev/null 2>/dev/null)
causing this error: "... unknown assembler invoked"
This is because /usr/bin/as is invoked (instead of the cross compile
version) because --prefix=/usr/bin is specified (as opposed to the
correct "--prefix=/usr/bin/${CROSS_COMPILE}")
This all started in commit ba64beb17493a ("kbuild: check the minimum
assembler version in Kconfig") which landed in 5.12
Note: this was submitted as https://crrev.com/c/2993714 by accident
wihout running style checks.
BUG=b:190342046
TEST=run chromeos/scripts/kernelconfig olddefconfig
Signed-off-by: Eizan Miyamoto <eizan@chromium.org>
Change-Id: Ib09150dd8239bd8d139956b9ed0806a940ee1120
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/3026231
Reviewed-by: Lukasz Majczak <lmajczak@google.com>
Reviewed-by: Sonny Rao <sonnyrao@chromium.org>
-rwxr-xr-x | chromeos/scripts/kernelconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chromeos/scripts/kernelconfig b/chromeos/scripts/kernelconfig index 3e3db553c672..fafbe91b3ecb 100755 --- a/chromeos/scripts/kernelconfig +++ b/chromeos/scripts/kernelconfig @@ -83,7 +83,8 @@ build_one() { set -- \ LD="ld.lld" \ CC="${ccompiler}" \ - CXX="${cross}-g++" + CXX="${cross}-g++" \ + CROSS_COMPILE="${cross}-" local O="$(pwd)/build/${arch}" mkdir -p "${O}" |