mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 07:22:33 +00:00
00f8c86624
The current build procedure always wipes away build files, this is costly as ssdk is a parent dependency on a whole host of packages and will always end up rebuilding (and in serial) the whole package. This patch includes: 1. Module Building Optimization: Instead of creating a temporary directory (temp) and copying files into it for module building, the directly invoke the module build command with the necessary paths. This simplifies the build process and avoids unnecessary file operations, speeding up the build process and reducing disk usage. 2. Parallel Build Support: By removing the explicit creation of the temporary directory and associated file copying operations, and passing in $(MAKE) $(PKG_JOBS) allows building in parallel. 3. Fix `EXTRA_CFLAGS`: This variable is referenced and set within MAKE_FLAGS, so doesn't preserve spaces. Should have its defined value quoted. Signed-off-by: Sean Khan <datapronix@protonmail.com>
51 lines
1.7 KiB
Diff
51 lines
1.7 KiB
Diff
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -1,17 +1,19 @@
|
|
-include ./config
|
|
-
|
|
ifndef PRJ_PATH
|
|
PRJ_PATH=$(shell pwd)
|
|
endif
|
|
export PRJ_PATH
|
|
|
|
-include ./make/config.mk
|
|
-include ./make/tools.mk
|
|
-include ./make/$(OS)_opt.mk
|
|
+include $(PRJ_PATH)/config
|
|
+
|
|
+include $(PRJ_PATH)/make/config.mk
|
|
+include $(PRJ_PATH)/make/tools.mk
|
|
+include $(PRJ_PATH)/make/$(OS)_opt.mk
|
|
|
|
SUB_DIR=$(patsubst %/, %, $(dir $(wildcard src/*/Makefile)))
|
|
SUB_LIB=$(subst src/, , $(SUB_DIR))
|
|
|
|
+include $(PRJ_PATH)/Makefile.modules
|
|
+
|
|
####################################################################
|
|
# SSDK-Style Makefile
|
|
####################################################################
|
|
@@ -27,11 +29,7 @@ all: $(BIN_DIR) kslib
|
|
# LNX Modules-Style Makefile
|
|
####################################################################
|
|
modules: $(BIN_DIR) kslib_c
|
|
- mkdir -p ./temp/;cp * ./temp -a;cd ./temp;cp ../Makefile.modules ./Makefile;
|
|
- make -C $(SYS_PATH) M=$(PRJ_PATH)/temp $(LNX_MAKEOPTS) modules
|
|
- cp $(PRJ_PATH)/temp/Module.symvers $(PRJ_PATH)/Module.symvers;
|
|
- cp temp/*.ko build/bin;
|
|
- rm -Rf ./temp/*.o ./temp/*.ko ./temp/*.a
|
|
+ @$(MAKE) -C $(SYS_PATH) M=$(PRJ_PATH) $(LNX_MAKEOPTS) modules
|
|
@echo "---Build [SSDK-$(VERSION)] at $(BUILD_DATE) finished."
|
|
|
|
kslib_c:
|
|
--- a/make/linux_opt.mk
|
|
+++ b/make/linux_opt.mk
|
|
@@ -777,6 +777,6 @@ LOCAL_CFLAGS += $(CPU_CFLAG) -D"KBUILD_M
|
|
####################################################################
|
|
# cflags for LNX Modules-Style Makefile
|
|
####################################################################
|
|
-LNX_LOCAL_CFLAGS += $(MODULE_INC) $(MODULE_CFLAG) ${EXTRA_INC} -DFALLTHROUGH
|
|
+LNX_LOCAL_CFLAGS = $(MODULE_INC) $(MODULE_CFLAG) ${EXTRA_INC} -DFALLTHROUGH
|
|
export LNX_LOCAL_CFLAGS
|
|
|