StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Replace last -includes by .KATI_DEPFILE"

Browse Source
This commit is contained in:
Shinichiro Hamaji
2016-03-15 23:00:11 +00:00
committed by Gerrit Code Review
parent 3c37889299 72904774a3
commit c26ec724b8
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/binary.mk
View File

@@ -1069,7 +1069,7 @@ ifneq ($(strip $(asm_objects_S)),)
$(asm_objects_S): $(intermediates)/%.o: $(TOPDIR)$(LOCAL_PATH)/%.S \ $(asm_objects_S): $(intermediates)/%.o: $(TOPDIR)$(LOCAL_PATH)/%.S \
$(my_additional_dependencies) $(my_additional_dependencies)
$(transform-$(PRIVATE_HOST)s-to-o) $(transform-$(PRIVATE_HOST)s-to-o)
$(call include-depfiles-for-objs, $(asm_objects)) $(call include-depfiles-for-objs, $(asm_objects_S))
endif endif
asm_sources_s := $(filter %.s,$(my_src_files)) asm_sources_s := $(filter %.s,$(my_src_files))

6
core/definitions.mk
View File

@@ -1366,7 +1366,7 @@ define compile-dotdot-cpp-file
o := $(intermediates)/$(patsubst %$(LOCAL_CPP_EXTENSION),%.o,$(subst ../,$(DOTDOT_REPLACEMENT),$(1))) o := $(intermediates)/$(patsubst %$(LOCAL_CPP_EXTENSION),%.o,$(subst ../,$(DOTDOT_REPLACEMENT),$(1)))
$$(o) : $(TOPDIR)$(LOCAL_PATH)/$(1) $(2) $$(o) : $(TOPDIR)$(LOCAL_PATH)/$(1) $(2)
$$(transform-$$(PRIVATE_HOST)cpp-to-o) $$(transform-$$(PRIVATE_HOST)cpp-to-o)
-include $$(o:%.o=%.P) $$(call include-depfiles-for-objs, $$(o))
$(3) += $$(o) $(3) += $$(o)
endef endef
@@ -1379,7 +1379,7 @@ define compile-dotdot-c-file
o := $(intermediates)/$(patsubst %.c,%.o,$(subst ../,$(DOTDOT_REPLACEMENT),$(1))) o := $(intermediates)/$(patsubst %.c,%.o,$(subst ../,$(DOTDOT_REPLACEMENT),$(1)))
$$(o) : $(TOPDIR)$(LOCAL_PATH)/$(1) $(2) $$(o) : $(TOPDIR)$(LOCAL_PATH)/$(1) $(2)
$$(transform-$$(PRIVATE_HOST)c-to-o) $$(transform-$$(PRIVATE_HOST)c-to-o)
-include $$(o:%.o=%.P) $$(call include-depfiles-for-objs, $$(o))
$(3) += $$(o) $(3) += $$(o)
endef endef
@@ -1392,7 +1392,7 @@ define compile-dotdot-s-file
o := $(intermediates)/$(patsubst %.S,%.o,$(subst ../,$(DOTDOT_REPLACEMENT),$(1))) o := $(intermediates)/$(patsubst %.S,%.o,$(subst ../,$(DOTDOT_REPLACEMENT),$(1)))
$$(o) : $(TOPDIR)$(LOCAL_PATH)/$(1) $(2) $$(o) : $(TOPDIR)$(LOCAL_PATH)/$(1) $(2)
$$(transform-$$(PRIVATE_HOST)s-to-o) $$(transform-$$(PRIVATE_HOST)s-to-o)
-include $$(o:%.o=%.P) $$(call include-depfiles-for-objs, $$(o))
$(3) += $$(o) $(3) += $$(o)
endef endef