You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2020/11/28 16:00:10 UTC
[incubator-nuttx] branch master updated: build system: add missing
--obj-path to MKDEP
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 88f1cdb build system: add missing --obj-path to MKDEP
88f1cdb is described below
commit 88f1cdb915682aba2acb2a4c446e00ffe9ed620b
Author: Matias N <ma...@protobits.dev>
AuthorDate: Sat Nov 28 10:42:54 2020 -0300
build system: add missing --obj-path to MKDEP
---
libs/libc/Makefile | 4 ++--
libs/libnx/Makefile | 4 ++--
mm/Makefile | 4 ++--
tools/Config.mk | 12 +++++++-----
4 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/libs/libc/Makefile b/libs/libc/Makefile
index dcb415a..4f1657f 100644
--- a/libs/libc/Makefile
+++ b/libs/libc/Makefile
@@ -165,9 +165,9 @@ makekdepfile: $(CSRCS:.c=.ddc) $(ASRCS:.S=.dds)
$(call DELFILE, $^)
.depend: Makefile $(SRCS) $(TOPDIR)$(DELIM).config
- $(Q) $(MAKE) makedepfile
+ $(Q) $(MAKE) makedepfile OBJPATH="bin"
ifneq ($(CONFIG_BUILD_FLAT),y)
- $(Q) $(MAKE) makekdepfile CFLAGS="$(CFLAGS) $(KDEFINE)"
+ $(Q) $(MAKE) makekdepfile CFLAGS="$(CFLAGS) $(KDEFINE)" OBJPATH="kbin"
endif
ifeq ($(CONFIG_LIB_ZONEINFO_ROMFS),y)
$(Q) $(MAKE) -C zoneinfo depend BIN=$(BIN)
diff --git a/libs/libnx/Makefile b/libs/libnx/Makefile
index ff83529..68b4176 100644
--- a/libs/libnx/Makefile
+++ b/libs/libnx/Makefile
@@ -244,9 +244,9 @@ makekdepfile: $(CSRCS:.c=.ddc) $(ASRCS:.S=.dds)
$(call DELFILE, $^)
.depend: Makefile gensources $(SRCS) $(TOPDIR)$(DELIM).config
- $(Q) $(MAKE) makedepfile
+ $(Q) $(MAKE) makedepfile OBJPATH="bin"
ifneq ($(CONFIG_BUILD_FLAT),y)
- $(Q) $(MAKE) makekdepfile CFLAGS="$(CFLAGS) $(KDEFINE)"
+ $(Q) $(MAKE) makekdepfile CFLAGS="$(CFLAGS) $(KDEFINE)" OBJPATH="kbin"
endif
$(Q) touch $@
diff --git a/mm/Makefile b/mm/Makefile
index 81b6c90..258eb2e 100644
--- a/mm/Makefile
+++ b/mm/Makefile
@@ -91,9 +91,9 @@ makekdepfile: $(CSRCS:.c=.ddc) $(ASRCS:.S=.dds)
$(call DELFILE, $^)
.depend: Makefile $(SRCS) $(TOPDIR)$(DELIM).config
- $(Q) $(MAKE) makedepfile
+ $(Q) $(MAKE) makedepfile OBJPATH="bin"
ifneq ($(CONFIG_BUILD_FLAT),y)
- $(Q) $(MAKE) makekdepfile CFLAGS="$(CFLAGS) $(KDEFINE)"
+ $(Q) $(MAKE) makekdepfile CFLAGS="$(CFLAGS) $(KDEFINE)" OBJPATH="kbin"
endif
$(Q) touch $@
diff --git a/tools/Config.mk b/tools/Config.mk
index aa4dd29..ed62a6e 100644
--- a/tools/Config.mk
+++ b/tools/Config.mk
@@ -202,20 +202,22 @@ endif
# Per-file dependency generation rules
+OBJPATH ?= .
+
%.dds: %.S
- $(Q) $(MKDEP) --obj-suffix $(OBJEXT) $(DEPPATH) "$(CC)" -- $(CFLAGS) -- $< > $@
+ $(Q) $(MKDEP) --obj-path $(OBJPATH) --obj-suffix $(OBJEXT) $(DEPPATH) "$(CC)" -- $(CFLAGS) -- $< > $@
%.ddc: %.c
- $(Q) $(MKDEP) --obj-suffix $(OBJEXT) $(DEPPATH) "$(CC)" -- $(CFLAGS) -- $< > $@
+ $(Q) $(MKDEP) --obj-path $(OBJPATH) --obj-suffix $(OBJEXT) $(DEPPATH) "$(CC)" -- $(CFLAGS) -- $< > $@
%.ddp: %.cpp
- $(Q) $(MKDEP) --obj-suffix $(OBJEXT) $(DEPPATH) "$(CXX)" -- $(CXXFLAGS) -- $< > $@
+ $(Q) $(MKDEP) --obj-path $(OBJPATH) --obj-suffix $(OBJEXT) $(DEPPATH) "$(CXX)" -- $(CXXFLAGS) -- $< > $@
%.ddx: %.cxx
- $(Q) $(MKDEP) --obj-suffix $(OBJEXT) $(DEPPATH) "$(CXX)" -- $(CXXFLAGS) -- $< > $@
+ $(Q) $(MKDEP) --obj-path $(OBJPATH) --obj-suffix $(OBJEXT) $(DEPPATH) "$(CXX)" -- $(CXXFLAGS) -- $< > $@
%.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
# directories