From ffedd905c2f90fd6a93fdf9ea93747805e411089 Mon Sep 17 00:00:00 2001 From: iabdalkader Date: Thu, 31 Dec 2020 19:04:52 +0200 Subject: [PATCH] Update Makefile. * Fix possible build dependency issue. * Detect number of cores instead of hard coded value. --- .travis.yml | 4 ++-- src/hal/cmsis/Makefile | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index c5cd23f4d..1b67d5b9b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,8 +31,8 @@ script: - popd - arm-none-eabi-gcc --version # build firmware - - make -j5 -C src/micropython/mpy-cross - - make -j5 TARGET=$TARGET -C src + - make -j$(nproc) -C src/micropython/mpy-cross + - make -j$(nproc) TARGET=$TARGET -C src - mkdir ~/build/$TARGET - cp -r src/build/bin/* ~/build/$TARGET diff --git a/src/hal/cmsis/Makefile b/src/hal/cmsis/Makefile index 1225ab66c..bfbab9671 100644 --- a/src/hal/cmsis/Makefile +++ b/src/hal/cmsis/Makefile @@ -31,7 +31,9 @@ OBJS = $(addprefix $(BUILD)/, $(SRC_S:.s=.o)) OBJS += $(addprefix $(BUILD)/, $(SRC_C:.c=.o)) OBJ_DIRS = $(sort $(dir $(OBJS))) -all: | $(OBJ_DIRS) $(OBJS) +all: $(OBJS) +$(OBJS): | $(OBJ_DIRS) + $(OBJ_DIRS): $(MKDIR) -p $@