From 8183865b7abdffb11b67ed7fa5ea6dd4059a6e23 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Wed, 12 Jun 2019 18:21:52 +0200
Subject: [kernel-vanilla] fix CC override in Makefile

+ make use of 'olddefconfig' target
---
 core/modules/kernel-vanilla/module.build | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'core/modules/kernel-vanilla')

diff --git a/core/modules/kernel-vanilla/module.build b/core/modules/kernel-vanilla/module.build
index 7881283a..d6128172 100644
--- a/core/modules/kernel-vanilla/module.build
+++ b/core/modules/kernel-vanilla/module.build
@@ -52,7 +52,6 @@ fetch_source() {
 		git apply < "$patch" || perror "Could not apply $patch"
 		echo "$patch" >> "patches-done"
 	done
-	sed -i -r 's/^CC\s*=\s*(\S)/CC ?= \1/' Makefile || perror "Could not patch Makefile"
 	cd -
 	# remember the current kernel version
 	echo "${SYSTEM_KERNEL_LONG}" > ksrc/KVERSION
@@ -75,16 +74,15 @@ build() {
 	cd ksrc || perror "Could not cd to ksrc, was the kernel source fetched properly?"
 	pinfo "Preparing kernel for new config ('make oldconfig')."
 	if [ "x$MLTK_QUIET" = "x1" ]; then
-		yes "" | make oldconfig || perror "make oldconfig failed."
+		make olddefconfig || perror "make oldconfig failed."
 	else
 		make oldconfig || perror "make oldconfig failed."
 	fi
-	make prepare || perror "make prepare failed."
-	make scripts || perror "make scripts failed."
 
 	pinfo "Compiling kernel... (this will take some time)"
 	# explicitly state number of cores here, as MAKEFLAGS seems to be overridden
-	make $MAKEFLAGS || perror "make failed."
+	# also pass CC if set by core/includes/system.inc
+	make $MAKEFLAGS ${CC:+CC=${CC}} || perror "make failed."
 
 	# install modules to build directory
 	pinfo "Installing kernel modules..."
-- 
cgit v1.2.3-55-g7522