Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-02 01:21:26 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

build system: add missing --obj-path to MKDEP

Browse Source
This commit is contained in:
Matias N
2020-11-28 10:42:54 -03:00
committed by Xiang Xiao
parent 3ec743f72f
commit 88f1cdb915
4 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/libc/Makefile
+2 -2
View File
@@ -165,9 +165,9 @@ makekdepfile: $(CSRCS:.c=.ddc) $(ASRCS:.S=.dds)
$(call DELFILE, $^) $(call DELFILE, $^)
.depend: Makefile $(SRCS) $(TOPDIR)$(DELIM).config .depend: Makefile $(SRCS) $(TOPDIR)$(DELIM).config
$(Q) $(MAKE) makedepfile $(Q) $(MAKE) makedepfile OBJPATH="bin"
ifneq ($(CONFIG_BUILD_FLAT),y) ifneq ($(CONFIG_BUILD_FLAT),y)
$(Q) $(MAKE) makekdepfile CFLAGS="$(CFLAGS) $(KDEFINE)" $(Q) $(MAKE) makekdepfile CFLAGS="$(CFLAGS) $(KDEFINE)" OBJPATH="kbin"
endif endif
ifeq ($(CONFIG_LIB_ZONEINFO_ROMFS),y) ifeq ($(CONFIG_LIB_ZONEINFO_ROMFS),y)
$(Q) $(MAKE) -C zoneinfo depend BIN=$(BIN) $(Q) $(MAKE) -C zoneinfo depend BIN=$(BIN)
libs/libnx/Makefile
+2 -2
View File
@@ -244,9 +244,9 @@ makekdepfile: $(CSRCS:.c=.ddc) $(ASRCS:.S=.dds)
$(call DELFILE, $^) $(call DELFILE, $^)
.depend: Makefile gensources $(SRCS) $(TOPDIR)$(DELIM).config .depend: Makefile gensources $(SRCS) $(TOPDIR)$(DELIM).config
$(Q) $(MAKE) makedepfile $(Q) $(MAKE) makedepfile OBJPATH="bin"
ifneq ($(CONFIG_BUILD_FLAT),y) ifneq ($(CONFIG_BUILD_FLAT),y)
$(Q) $(MAKE) makekdepfile CFLAGS="$(CFLAGS) $(KDEFINE)" $(Q) $(MAKE) makekdepfile CFLAGS="$(CFLAGS) $(KDEFINE)" OBJPATH="kbin"
endif endif
$(Q) touch $@ $(Q) touch $@
mm/Makefile
+2 -2
View File
@@ -91,9 +91,9 @@ makekdepfile: $(CSRCS:.c=.ddc) $(ASRCS:.S=.dds)
$(call DELFILE, $^) $(call DELFILE, $^)
.depend: Makefile $(SRCS) $(TOPDIR)$(DELIM).config .depend: Makefile $(SRCS) $(TOPDIR)$(DELIM).config
$(Q) $(MAKE) makedepfile $(Q) $(MAKE) makedepfile OBJPATH="bin"
ifneq ($(CONFIG_BUILD_FLAT),y) ifneq ($(CONFIG_BUILD_FLAT),y)
$(Q) $(MAKE) makekdepfile CFLAGS="$(CFLAGS) $(KDEFINE)" $(Q) $(MAKE) makekdepfile CFLAGS="$(CFLAGS) $(KDEFINE)" OBJPATH="kbin"
endif endif
$(Q) touch $@ $(Q) touch $@
tools/Config.mk
+7 -5
View File
@@ -202,20 +202,22 @@ endif
# Per-file dependency generation rules # Per-file dependency generation rules
OBJPATH ?= .
%.dds: %.S %.dds: %.S
$(Q) $(MKDEP) --obj-suffix $(OBJEXT) $(DEPPATH) "$(CC)" -- $(CFLAGS) -- $< > $@ $(Q) $(MKDEP) --obj-path $(OBJPATH) --obj-suffix $(OBJEXT) $(DEPPATH) "$(CC)" -- $(CFLAGS) -- $< > $@
%.ddc: %.c %.ddc: %.c
$(Q) $(MKDEP) --obj-suffix $(OBJEXT) $(DEPPATH) "$(CC)" -- $(CFLAGS) -- $< > $@ $(Q) $(MKDEP) --obj-path $(OBJPATH) --obj-suffix $(OBJEXT) $(DEPPATH) "$(CC)" -- $(CFLAGS) -- $< > $@
%.ddp: %.cpp %.ddp: %.cpp
$(Q) $(MKDEP) --obj-suffix $(OBJEXT) $(DEPPATH) "$(CXX)" -- $(CXXFLAGS) -- $< > $@ $(Q) $(MKDEP) --obj-path $(OBJPATH) --obj-suffix $(OBJEXT) $(DEPPATH) "$(CXX)" -- $(CXXFLAGS) -- $< > $@
%.ddx: %.cxx %.ddx: %.cxx
$(Q) $(MKDEP) --obj-suffix $(OBJEXT) $(DEPPATH) "$(CXX)" -- $(CXXFLAGS) -- $< > $@ $(Q) $(MKDEP) --obj-path $(OBJPATH) --obj-suffix $(OBJEXT) $(DEPPATH) "$(CXX)" -- $(CXXFLAGS) -- $< > $@
%.ddh: %.c %.ddh: %.c
$(Q) $(MKDEP) --obj-suffix $(OBJEXT) $(DEPPATH) "$(CC)" -- $(HOSTCFLAGS) -- $< > $@ $(Q) $(MKDEP) --obj-path $(OBJPATH) --obj-suffix $(OBJEXT) $(DEPPATH) "$(CC)" -- $(HOSTCFLAGS) -- $< > $@
# INCDIR - Convert a list of directory paths to a list of compiler include # INCDIR - Convert a list of directory paths to a list of compiler include
# directories # directories