aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2019-11-12 21:21:17 +0100
committerGravatar Yann E. MORIN <yann.morin.1998@free.fr>2019-11-13 22:39:53 +0100
commit68a0ec37581f1653e47f7107507f51eb4c6eeda3 (patch)
tree7dd287005dd7077556f42e7ce26dd70c43535471
parenta7c4fce8084ae338f7215b09de93aee241409fbf (diff)
downloadbuildroot-68a0ec37581f1653e47f7107507f51eb4c6eeda3.tar.gz
buildroot-68a0ec37581f1653e47f7107507f51eb4c6eeda3.tar.bz2
toolchain/helpers: make sure we bail out when kernel headers check fails
In commit 6136765b23abd9faba610dd54ed276a777811575 ("toolchain: generate check-headers program under $(BUILD_DIR)"), the check_kernel_headers_version function was simplified to not check the return value of the check-kernel-headers.sh script, assuming that "make" does bail out on the first failing command. However, check_kernel_headers_version when used in $(2)_CONFIGURE_CMDS from pkg-toolchain-external.mk, is called in a sequence of commands, where the return value of each command is not checked. Therefore, a failure of check-kernel-headers.sh no longer aborts the build. Since all other macros are using this principle of calling "exit 1", we revert back to the same for check_kernel_headers_version, as it was done prior to 6136765b23abd9faba610dd54ed276a777811575. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Cc: Carlos Santos <unixmania@gmail.com> Reviewed-by: Carlos Santos <unixmania@gmail.com> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
-rw-r--r--toolchain/helpers.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk
index 42e5522060..996cc70d44 100644
--- a/toolchain/helpers.mk
+++ b/toolchain/helpers.mk
@@ -163,7 +163,9 @@ copy_toolchain_sysroot = \
# $3: kernel version string, in the form: X.Y
#
check_kernel_headers_version = \
- support/scripts/check-kernel-headers.sh $(1) $(2) $(3)
+ if ! support/scripts/check-kernel-headers.sh $(1) $(2) $(3); then \
+ exit 1; \
+ fi
#
# Check the specific gcc version actually matches the version in the