make: generic_compile: Fix missing dependencies am: 901ec5aa87 Original change: https://android-review.googlesource.com/c/trusty/lk/trusty/+/3470209 Change-Id: Iba2d38810c247dabd5c25c06352a716171ea2823 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/make/generic_compile.mk b/make/generic_compile.mk index 1c645ff..bef406b 100644 --- a/make/generic_compile.mk +++ b/make/generic_compile.mk
@@ -60,6 +60,8 @@ GENERIC_OBJS := $(strip $(GENERIC_C_OBJS) $(GENERIC_CC_OBJS) $(GENERIC_CPP_OBJS) $(GENERIC_ASM_OBJS)) +ALLOBJS += $(GENERIC_OBJS) + # Bind inputs. $(GENERIC_OBJS): CC := $(GENERIC_CC) $(GENERIC_OBJS): FLAGS := $(GENERIC_FLAGS) @@ -71,25 +73,25 @@ $(GENERIC_C_OBJS): $(GENERIC_OBJ_DIR)/%.c.o: %.c $(GENERIC_SRCDEPS) @$(call ECHO,$(LOG_NAME),building,$@) @$(MKDIR) - $(NOECHO)$(CC) $(FLAGS) $(CFLAGS) -c $< -MMD -o $@ + $(NOECHO)$(CC) $(FLAGS) $(CFLAGS) -c $< -MMD -MP -o $@ @$(call ECHO_DONE_SILENT,$(LOG_NAME),building,$@) $(GENERIC_CC_OBJS): $(GENERIC_OBJ_DIR)/%.cc.o: %.cc $(GENERIC_SRCDEPS) @$(call ECHO,$(LOG_NAME),building,$@) @$(MKDIR) - $(NOECHO)$(CC) $(FLAGS) $(CPPFLAGS) -c $< -MMD -o $@ + $(NOECHO)$(CC) $(FLAGS) $(CPPFLAGS) -c $< -MMD -MP -o $@ @$(call ECHO_DONE_SILENT,$(LOG_NAME),building,$@) $(GENERIC_CPP_OBJS): $(GENERIC_OBJ_DIR)/%.cpp.o: %.cpp $(GENERIC_SRCDEPS) @$(call ECHO,$(LOG_NAME),building,$@) @$(MKDIR) - $(NOECHO)$(CC) $(FLAGS) $(CPPFLAGS) -c $< -MMD -o $@ + $(NOECHO)$(CC) $(FLAGS) $(CPPFLAGS) -c $< -MMD -MP -o $@ @$(call ECHO_DONE_SILENT,$(LOG_NAME),building,$@) $(GENERIC_ASM_OBJS): $(GENERIC_OBJ_DIR)/%.S.o: %.S $(GENERIC_SRCDEPS) @$(call ECHO,$(LOG_NAME),building,$@) @$(MKDIR) - $(NOECHO)$(CC) $(FLAGS) $(ASMFLAGS) -c $< -MMD -o $@ + $(NOECHO)$(CC) $(FLAGS) $(ASMFLAGS) -c $< -MMD -MP -o $@ @$(call ECHO_DONE_SILENT,$(LOG_NAME),building,$@) # Cleanup inputs