diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2021-03-12 09:24:11 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2021-03-13 10:33:36 +0100 |
| commit | 114fecbd4e97e97d44d9c899b4445a51d9f45529 (patch) | |
| tree | 22ce653d4c21d73e7fbef2811bf03badc0a1d2ef | |
| parent | 2031c18c0cf3a08dc79bef4568ac07467ab275c0 (diff) | |
| download | ptxdist-114fecbd4e97e97d44d9c899b4445a51d9f45529.tar.gz ptxdist-114fecbd4e97e97d44d9c899b4445a51d9f45529.tar.xz | |
kernel: really fix disabling gcc plugins for >= v5.11
The prepare stage calls 'oldconfig' again and here KERNEL_MAKE_ENV is not
used so the config changes again. Use KERNEL_CONF_ENV instead. That is used
implicitly in both cases.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/kernel.make | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rules/kernel.make b/rules/kernel.make index 7919a3ff8..ea748fc8a 100644 --- a/rules/kernel.make +++ b/rules/kernel.make @@ -79,7 +79,7 @@ ifndef PTXCONF_KERNEL_GCC_PLUGINS KERNEL_SHARED_OPT += \ HOSTCXX="$(HOSTCXX) -DGENERATOR_FILE" \ HOSTCC="$(HOSTCC) -DGENERATOR_FILE" -KERNEL_MAKE_ENV := \ +KERNEL_CONF_ENV := \ PTXDIST_NO_GCC_PLUGINS=1 endif @@ -326,6 +326,6 @@ endif # ---------------------------------------------------------------------------- $(call ptx/kconfig-targets, kernel): $(STATEDIR)/kernel.extract - @$(KERNEL_MAKE_ENV) $(call world/kconfig, KERNEL, $(subst kernel_,,$@)) + @$(call world/kconfig, KERNEL, $(subst kernel_,,$@)) # vim: syntax=make |