sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

arch/arm/src/Makefile: dependency directory list is now computed from the VPATH. From Richard Cochran

Browse Source
This commit is contained in:
Gregory Nutt 2014-01-23 07:41:00 -06:00
parent 85dea13030
commit 7ce90ef7e2
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -6484,7 +6484,7 @@
ostest/Make.defs: Add a configuration option to select the -m32
compiler option when building for a 32-bit target on a native 64-bit
compiler (2014-1-18).
* include/ctype.h: Typo in macro name: iscntrol, not iscontrol (2104-1-17)
* include/ctype.h: Typo in macro name: iscntrl, not iscontrol (2104-1-17)
* libc/unistd/lib_getopt.c: If there are no arguments (argc == 1), then
getopt() make like the optind variable in an undefined state (2014-1-20).
* configs/olimex-stm32-p107: Failes to build is SPI3 for UEXT is not
@ -6498,3 +6498,5 @@
* tools/Config.mk: 'cypath' must be called if we are using a Windows
native toolchain with the Cygwin 'make' to convert paths to proper
Windows paths. From Richard Cochran (2014-1-23).
* /arch/arm/src/Makefile: dependency directory list is not computed
from the VPATH. From Richard Cochran (2014-1-23).

6
arch/arm/src/Makefile
View File

@ -150,7 +150,9 @@ endif
LIBGCC = "${shell "$(CC)" $(ARCHCPUFLAGS) -print-libgcc-file-name}"
GCC_LIBDIR := ${shell dirname $(LIBGCC)}
VPATH = chip:common:$(ARCH_SUBDIR)
VPATH += chip
VPATH += common
VPATH += $(ARCH_SUBDIR)
all: $(HEAD_OBJ) $(BIN)
@ -202,7 +204,7 @@ endif
ifeq ($(BOARDMAKE),y)
$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" depend
endif
$(Q) $(MKDEP) --dep-path chip --dep-path common --dep-path $(ARCH_SUBDIR) \
$(Q) $(MKDEP) $(patsubst %,--dep-path %,$(subst :, ,$(VPATH))) \
"$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
$(Q) touch $@