diff options
| -rwxr-xr-x | buildkernel.sh | 8 | ||||
| -rwxr-xr-x | kernel_definitions.mk | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/buildkernel.sh b/buildkernel.sh index b1f3f02..d11e7b5 100755 --- a/buildkernel.sh +++ b/buildkernel.sh @@ -58,7 +58,7 @@ make_defconfig() echo "Building defconfig" set -x (cd ${KERNEL_DIR} && \ - make O=${OUT_DIR} ${MAKE_ARGS} HOSTCFLAGS="${TARGET_INCLUDES}" HOSTLDFLAGS="${TARGET_LINCLUDES}" ARCH=${ARCH} CROSS_COMPILE=${CROSS_COMPILE} ${DEFCONFIG}) + ${MAKE_PATH}make O=${OUT_DIR} ${MAKE_ARGS} HOSTCFLAGS="${TARGET_INCLUDES}" HOSTLDFLAGS="${TARGET_LINCLUDES}" ARCH=${ARCH} CROSS_COMPILE=${CROSS_COMPILE} ${DEFCONFIG}) set +x fi } @@ -70,7 +70,7 @@ headers_install() echo "Installing kernel headers" set -x (cd ${OUT_DIR} && \ - make HOSTCFLAGS="${TARGET_INCLUDES}" HOSTLDFLAGS="${TARGET_LINCLUDES}" ARCH=${ARCH} CROSS_COMPILE=${CROSS_COMPILE} O=${OUT_DIR} ${CC_ARG} ${MAKE_ARGS} headers_install) + ${MAKE_PATH}make HOSTCFLAGS="${TARGET_INCLUDES}" HOSTLDFLAGS="${TARGET_LINCLUDES}" ARCH=${ARCH} CROSS_COMPILE=${CROSS_COMPILE} O=${OUT_DIR} ${CC_ARG} ${MAKE_ARGS} headers_install) set +x } @@ -81,7 +81,7 @@ build_kernel() echo "Building kernel" set -x (cd ${OUT_DIR} && \ - make ARCH=${ARCH} CROSS_COMPILE=${CROSS_COMPILE} HOSTCFLAGS="${TARGET_INCLUDES}" HOSTLDFLAGS="${TARGET_LINCLUDES}" O=${OUT_DIR} ${CC_ARG} ${MAKE_ARGS} -j$(nproc)) + ${MAKE_PATH}make ARCH=${ARCH} CROSS_COMPILE=${CROSS_COMPILE} HOSTCFLAGS="${TARGET_INCLUDES}" HOSTLDFLAGS="${TARGET_LINCLUDES}" O=${OUT_DIR} ${CC_ARG} ${MAKE_ARGS} -j$(nproc)) set +x } @@ -94,7 +94,7 @@ modules_install() mkdir -p ${MODULES_STAGING_DIR} set -x (cd ${OUT_DIR} && \ - make O=${OUT_DIR} ${CC_ARG} INSTALL_MOD_STRIP=1 INSTALL_MOD_PATH=${MODULES_STAGING_DIR} ${MAKE_ARGS} modules_install) + ${MAKE_PATH}make O=${OUT_DIR} ${CC_ARG} INSTALL_MOD_STRIP=1 INSTALL_MOD_PATH=${MODULES_STAGING_DIR} ${MAKE_ARGS} modules_install) set +x } diff --git a/kernel_definitions.mk b/kernel_definitions.mk index 7b18450..e180a42 100755 --- a/kernel_definitions.mk +++ b/kernel_definitions.mk @@ -170,12 +170,14 @@ ifdef RTIC_MPGEN RTIC_DTB := $(KERNEL_SYMLINK)/rtic_mp.dtb endif +MAKE_PATH := $(SOURCE_ROOT)/prebuilts/build-tools/linux-x86/bin/ # Android Kernel make rules $(KERNEL_HEADERS_INSTALL): $(KERNEL_OUT) $(KERNEL_GENERATE_DEFCONFIG) $(DTC) $(UFDT_APPLY_OVERLAY) KERNEL_DIR=$(TARGET_KERNEL_SOURCE) \ DEFCONFIG=$(KERNEL_DEFCONFIG) \ OUT_DIR=$(KERNEL_OUT) \ + MAKE_PATH=$(MAKE_PATH)\ ARCH=$(KERNEL_ARCH) \ CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) \ KERNEL_MODULES_OUT=$(KERNEL_MODULES_OUT) \ @@ -203,6 +205,7 @@ $(TARGET_PREBUILT_KERNEL): $(KERNEL_OUT) $(KERNEL_GENERATE_DEFCONFIG) $(DTC) $(K KERNEL_DIR=$(TARGET_KERNEL_SOURCE) \ DEFCONFIG=$(KERNEL_DEFCONFIG) \ OUT_DIR=$(KERNEL_OUT) \ + MAKE_PATH=$(MAKE_PATH)\ ARCH=$(KERNEL_ARCH) \ CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) \ KERNEL_MODULES_OUT=$(KERNEL_MODULES_OUT) \ |