diff mbox series

[1/2] package/nvidia-driver: define IGNORE_CC_MISMATCH

Message ID 20220620190115.541032-1-vfazio@xes-inc.com
State Accepted
Headers show
Series [1/2] package/nvidia-driver: define IGNORE_CC_MISMATCH | expand

Commit Message

Vincent Fazio June 20, 2022, 7:01 p.m. UTC
Leverage IGNORE_CC_MISMATCH for kernel module builds to avoid an issue
where NVIDIA's `cc_version_check` in kernel/conftest.sh may fail due
to matching on the pkgversion substring of the GCC version string in
the kernel's include/generated/compile.h.

Signed-off-by: Vincent Fazio <vfazio@xes-inc.com>
---
 package/nvidia-driver/nvidia-driver.mk | 1 +
 1 file changed, 1 insertion(+)

Comments

Arnout Vandecappelle July 23, 2022, 7:38 p.m. UTC | #1
On 20/06/2022 21:01, Vincent Fazio wrote:
> Leverage IGNORE_CC_MISMATCH for kernel module builds to avoid an issue
> where NVIDIA's `cc_version_check` in kernel/conftest.sh may fail due
> to matching on the pkgversion substring of the GCC version string in
> the kernel's include/generated/compile.h.
> 
> Signed-off-by: Vincent Fazio <vfazio@xes-inc.com>

  Applied to master, thanks.

  Regards,
  Arnout

> ---
>   package/nvidia-driver/nvidia-driver.mk | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/package/nvidia-driver/nvidia-driver.mk b/package/nvidia-driver/nvidia-driver.mk
> index 54c2aa46d8..ec070e3ca6 100644
> --- a/package/nvidia-driver/nvidia-driver.mk
> +++ b/package/nvidia-driver/nvidia-driver.mk
> @@ -137,6 +137,7 @@ endif
>   # because they don't recognise the usual variables set by the kernel
>   # build system. We also need to tell them what modules to build.
>   NVIDIA_DRIVER_MODULE_MAKE_OPTS = \
> +	IGNORE_CC_MISMATCH=1 \
>   	NV_KERNEL_SOURCES="$(LINUX_DIR)" \
>   	NV_KERNEL_OUTPUT="$(LINUX_DIR)" \
>   	NV_KERNEL_MODULES="$(NVIDIA_DRIVER_MODULES)"
Peter Korsgaard Aug. 17, 2022, 6:55 a.m. UTC | #2
>>>>> "Arnout" == Arnout Vandecappelle <arnout@mind.be> writes:

 > On 20/06/2022 21:01, Vincent Fazio wrote:
 >> Leverage IGNORE_CC_MISMATCH for kernel module builds to avoid an issue
 >> where NVIDIA's `cc_version_check` in kernel/conftest.sh may fail due
 >> to matching on the pkgversion substring of the GCC version string in
 >> the kernel's include/generated/compile.h.
 >> Signed-off-by: Vincent Fazio <vfazio@xes-inc.com>

Committed to 2022.05.x and 2022.02.x, thanks.
diff mbox series

Patch

diff --git a/package/nvidia-driver/nvidia-driver.mk b/package/nvidia-driver/nvidia-driver.mk
index 54c2aa46d8..ec070e3ca6 100644
--- a/package/nvidia-driver/nvidia-driver.mk
+++ b/package/nvidia-driver/nvidia-driver.mk
@@ -137,6 +137,7 @@  endif
 # because they don't recognise the usual variables set by the kernel
 # build system. We also need to tell them what modules to build.
 NVIDIA_DRIVER_MODULE_MAKE_OPTS = \
+	IGNORE_CC_MISMATCH=1 \
 	NV_KERNEL_SOURCES="$(LINUX_DIR)" \
 	NV_KERNEL_OUTPUT="$(LINUX_DIR)" \
 	NV_KERNEL_MODULES="$(NVIDIA_DRIVER_MODULES)"