diff options
author | Jonathan Bauer | 2019-06-12 18:22:38 +0200 |
---|---|---|
committer | Jonathan Bauer | 2019-06-12 18:22:38 +0200 |
commit | 65b82913150964559c741d429622ca6158b64398 (patch) | |
tree | a943499db94b255eb5386aa8756f2f08b48210f2 | |
parent | Merge branch 'master' into installer (diff) | |
parent | [kernel-vanilla] fix CC override in Makefile (diff) | |
download | mltk-65b82913150964559c741d429622ca6158b64398.tar.gz mltk-65b82913150964559c741d429622ca6158b64398.tar.xz mltk-65b82913150964559c741d429622ca6158b64398.zip |
Merge branch 'master' into installer
-rw-r--r-- | core/modules/kernel-vanilla/module.build | 8 |
1 files changed, 3 insertions, 5 deletions
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..." |