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 2021/07/06 12:03:12 UTC
[incubator-nuttx-apps] branch master updated (931a873 -> b831e11)
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git.
from 931a873 examples/configdata: Fix some printf format warnings
new 9b7fe15 Generate c source code dependence with c compiler and flags
new b831e11 Application.mk: correct depends file generated
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
Application.mk | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
[incubator-nuttx-apps] 01/02: Generate c source code dependence
with c compiler and flags
Posted by xi...@apache.org.
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-apps.git
commit 9b7fe15bfbe80ce77187fc16c960839e8db10c64
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Tue Jul 6 14:03:57 2021 +0800
Generate c source code dependence with c compiler and flags
It's wrong to invoke the c++ compiler with c++ flags
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
Change-Id: I2536daa764275221ca530fd5abfc7568af921570
---
Application.mk | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/Application.mk b/Application.mk
index f051eb5..798120e 100644
--- a/Application.mk
+++ b/Application.mk
@@ -216,11 +216,8 @@ register::
endif
.depend: Makefile $(wildcard $(foreach SRC, $(SRCS), $(addsuffix /$(SRC), $(subst :, ,$(VPATH))))) $(DEPCONFIG)
-ifeq ($(filter %$(CXXEXT),$(SRCS)),)
- $(Q) $(MKDEP) $(DEPPATH) "$(CC)" -- $(CFLAGS) -- $(filter-out Makefile,$(filter-out $(DEPCONFIG),$^)) >Make.dep
-else
- $(Q) $(MKDEP) $(DEPPATH) "$(CXX)" -- $(CXXFLAGS) -- $(filter-out Makefile,$(filter-out $(DEPCONFIG),$^)) >Make.dep
-endif
+ $(Q) $(MKDEP) $(DEPPATH) "$(CC)" -- $(CFLAGS) -- $(filter-out %$(CXXEXT) Makefile $(DEPCONFIG),$^) >Make.dep
+ $(Q) $(MKDEP) $(DEPPATH) "$(CXX)" -- $(CXXFLAGS) -- $(filter-out %.c Makefile $(DEPCONFIG),$^) >>Make.dep
$(Q) touch $@
depend:: .depend
[incubator-nuttx-apps] 02/02: Application.mk: correct depends file
generated
Posted by xi...@apache.org.
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-apps.git
commit b831e1192e45dac65c6a20427114c741a31adfdf
Author: ligd <li...@xiaomi.com>
AuthorDate: Tue Jul 6 14:49:46 2021 +0800
Application.mk: correct depends file generated
wrong: file.c => file.dir.o
right: file.c => file.c.dir.o
Change-Id: I5dff2c05c88d4c5d7678acdcce15e87caa23bdaf
Signed-off-by: ligd <li...@xiaomi.com>
---
Application.mk | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/Application.mk b/Application.mk
index 798120e..cb0688b 100644
--- a/Application.mk
+++ b/Application.mk
@@ -92,7 +92,6 @@ endif
DEPPATH += --dep-path .
DEPPATH += --obj-path .
-DEPPATH += --obj-suffix $(SUFFIX)$(OBJEXT)
VPATH += :.
@@ -216,8 +215,8 @@ register::
endif
.depend: Makefile $(wildcard $(foreach SRC, $(SRCS), $(addsuffix /$(SRC), $(subst :, ,$(VPATH))))) $(DEPCONFIG)
- $(Q) $(MKDEP) $(DEPPATH) "$(CC)" -- $(CFLAGS) -- $(filter-out %$(CXXEXT) Makefile $(DEPCONFIG),$^) >Make.dep
- $(Q) $(MKDEP) $(DEPPATH) "$(CXX)" -- $(CXXFLAGS) -- $(filter-out %.c Makefile $(DEPCONFIG),$^) >>Make.dep
+ $(Q) $(MKDEP) $(DEPPATH) --obj-suffix .c$(SUFFIX)$(OBJEXT) "$(CC)" -- $(CFLAGS) -- $(filter-out %$(CXXEXT) Makefile $(DEPCONFIG),$^) >Make.dep
+ $(Q) $(MKDEP) $(DEPPATH) --obj-suffix $(CXXEXT)$(SUFFIX)$(OBJEXT) "$(CXX)" -- $(CXXFLAGS) -- $(filter-out %.c Makefile $(DEPCONFIG),$^) >>Make.dep
$(Q) touch $@
depend:: .depend