mirror of
https://github.com/apache/nuttx.git
synced 2026-05-30 05:16:47 +08:00
arch: Remove board/libboard$(LIBEXT) from the rerequest of export_startup
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
committed by
Petro Karashchenko
parent
23200471df
commit
1ba316b5c7
@@ -178,7 +178,7 @@ endif
|
|||||||
# Note that there may not be a head object if layout is handled
|
# Note that there may not be a head object if layout is handled
|
||||||
# by the linker configuration.
|
# by the linker configuration.
|
||||||
|
|
||||||
export_startup: board$(DELIM)libboard$(LIBEXT) $(STARTUP_OBJS)
|
export_startup: $(STARTUP_OBJS)
|
||||||
ifneq ($(STARTUP_OBJS),)
|
ifneq ($(STARTUP_OBJS),)
|
||||||
$(Q) if [ -d "$(EXPORT_DIR)$(DELIM)startup" ]; then \
|
$(Q) if [ -d "$(EXPORT_DIR)$(DELIM)startup" ]; then \
|
||||||
cp -f $(STARTUP_OBJS) "$(EXPORT_DIR)$(DELIM)startup$(DELIM)."; \
|
cp -f $(STARTUP_OBJS) "$(EXPORT_DIR)$(DELIM)startup$(DELIM)."; \
|
||||||
|
|||||||
@@ -102,7 +102,7 @@ endif
|
|||||||
|
|
||||||
# This is part of the top-level export target
|
# This is part of the top-level export target
|
||||||
|
|
||||||
export_startup: board/libboard$(LIBEXT) $(STARTUP_OBJS)
|
export_startup: $(STARTUP_OBJS)
|
||||||
$(Q) if [ -d "$(EXPORT_DIR)/startup" ]; then \
|
$(Q) if [ -d "$(EXPORT_DIR)/startup" ]; then \
|
||||||
cp -f $(STARTUP_OBJS) "$(EXPORT_DIR)/startup"; \
|
cp -f $(STARTUP_OBJS) "$(EXPORT_DIR)/startup"; \
|
||||||
else \
|
else \
|
||||||
|
|||||||
@@ -151,7 +151,7 @@ nuttx$(EXEEXT): $(HEAD_OBJ) board$(DELIM)libboard$(LIBEXT) $(LDSCRIPT)
|
|||||||
# Note that there may not be a head object if layout is handled
|
# Note that there may not be a head object if layout is handled
|
||||||
# by the linker configuration.
|
# by the linker configuration.
|
||||||
|
|
||||||
export_startup: board$(DELIM)libboard$(LIBEXT) $(STARTUP_OBJS)
|
export_startup: $(STARTUP_OBJS)
|
||||||
ifneq ($(STARTUP_OBJS),)
|
ifneq ($(STARTUP_OBJS),)
|
||||||
$(Q) if [ -d "$(EXPORT_DIR)$(DELIM)startup" ]; then \
|
$(Q) if [ -d "$(EXPORT_DIR)$(DELIM)startup" ]; then \
|
||||||
cp -f $(STARTUP_OBJS) "$(EXPORT_DIR)$(DELIM)startup$(DELIM)."; \
|
cp -f $(STARTUP_OBJS) "$(EXPORT_DIR)$(DELIM)startup$(DELIM)."; \
|
||||||
|
|||||||
@@ -114,7 +114,7 @@ endif
|
|||||||
|
|
||||||
# This is part of the top-level export target
|
# This is part of the top-level export target
|
||||||
|
|
||||||
export_startup: board/libboard$(LIBEXT) $(STARTUP_OBJS)
|
export_startup: $(STARTUP_OBJS)
|
||||||
$(Q) if [ -d "$(EXPORT_DIR)/startup" ]; then \
|
$(Q) if [ -d "$(EXPORT_DIR)/startup" ]; then \
|
||||||
cp -f $(STARTUP_OBJS) "$(EXPORT_DIR)/startup"; \
|
cp -f $(STARTUP_OBJS) "$(EXPORT_DIR)/startup"; \
|
||||||
else \
|
else \
|
||||||
|
|||||||
@@ -100,7 +100,7 @@ endif
|
|||||||
|
|
||||||
# This is part of the top-level export target
|
# This is part of the top-level export target
|
||||||
|
|
||||||
export_startup: board/libboard$(LIBEXT) $(STARTUP_OBJS)
|
export_startup: $(STARTUP_OBJS)
|
||||||
$(Q) if [ -d "$(EXPORT_DIR)/startup" ]; then \
|
$(Q) if [ -d "$(EXPORT_DIR)/startup" ]; then \
|
||||||
cp -f $(STARTUP_OBJS) "$(EXPORT_DIR)/startup"; \
|
cp -f $(STARTUP_OBJS) "$(EXPORT_DIR)/startup"; \
|
||||||
else \
|
else \
|
||||||
|
|||||||
@@ -103,7 +103,7 @@ endif
|
|||||||
|
|
||||||
# This is part of the top-level export target
|
# This is part of the top-level export target
|
||||||
|
|
||||||
export_startup: board/libboard$(LIBEXT) $(STARTUP_OBJS)
|
export_startup: $(STARTUP_OBJS)
|
||||||
$(Q) if [ -d "$(EXPORT_DIR)/startup" ]; then \
|
$(Q) if [ -d "$(EXPORT_DIR)/startup" ]; then \
|
||||||
cp -f $(STARTUP_OBJS) "$(EXPORT_DIR)/startup"; \
|
cp -f $(STARTUP_OBJS) "$(EXPORT_DIR)/startup"; \
|
||||||
else \
|
else \
|
||||||
|
|||||||
@@ -140,7 +140,7 @@ endif
|
|||||||
# Note that there may not be a head object if layout is handled
|
# Note that there may not be a head object if layout is handled
|
||||||
# by the linker configuration.
|
# by the linker configuration.
|
||||||
|
|
||||||
export_startup: board$(DELIM)libboard$(LIBEXT) $(STARTUP_OBJS)
|
export_startup: $(STARTUP_OBJS)
|
||||||
ifneq ($(STARTUP_OBJS),)
|
ifneq ($(STARTUP_OBJS),)
|
||||||
$(Q) if [ -d "$(EXPORT_DIR)$(DELIM)startup" ]; then \
|
$(Q) if [ -d "$(EXPORT_DIR)$(DELIM)startup" ]; then \
|
||||||
cp -f $(STARTUP_OBJS) "$(EXPORT_DIR)$(DELIM)startup$(DELIM)."; \
|
cp -f $(STARTUP_OBJS) "$(EXPORT_DIR)$(DELIM)startup$(DELIM)."; \
|
||||||
|
|||||||
@@ -108,7 +108,7 @@ endif
|
|||||||
|
|
||||||
# This is part of the top-level export target
|
# This is part of the top-level export target
|
||||||
|
|
||||||
export_startup: board/libboard$(LIBEXT) $(STARTUP_OBJS)
|
export_startup: $(STARTUP_OBJS)
|
||||||
$(Q) if [ -d "$(EXPORT_DIR)/startup" ]; then \
|
$(Q) if [ -d "$(EXPORT_DIR)/startup" ]; then \
|
||||||
cp -f $(STARTUP_OBJS) "$(EXPORT_DIR)/startup"; \
|
cp -f $(STARTUP_OBJS) "$(EXPORT_DIR)/startup"; \
|
||||||
else \
|
else \
|
||||||
|
|||||||
@@ -180,7 +180,7 @@ endif
|
|||||||
# Note that there may not be a head object if layout is handled
|
# Note that there may not be a head object if layout is handled
|
||||||
# by the linker configuration.
|
# by the linker configuration.
|
||||||
|
|
||||||
export_startup: board/libboard$(LIBEXT) $(STARTUP_OBJS)
|
export_startup: $(STARTUP_OBJS)
|
||||||
ifneq ($(STARTUP_OBJS),)
|
ifneq ($(STARTUP_OBJS),)
|
||||||
$(Q) if [ -d "$(EXPORT_DIR)/startup" ]; then \
|
$(Q) if [ -d "$(EXPORT_DIR)/startup" ]; then \
|
||||||
cp -f $(STARTUP_OBJS) "$(EXPORT_DIR)/startup/."; \
|
cp -f $(STARTUP_OBJS) "$(EXPORT_DIR)/startup/."; \
|
||||||
|
|||||||
@@ -247,7 +247,7 @@ RELLIBS += -lboard
|
|||||||
|
|
||||||
all: up_head$(OBJEXT) libarch$(LIBEXT)
|
all: up_head$(OBJEXT) libarch$(LIBEXT)
|
||||||
|
|
||||||
.PHONY: board/libboard$(LIBEXT) export_startup clean distclean cleanrel depend
|
.PHONY: export_startup clean distclean cleanrel depend
|
||||||
|
|
||||||
$(AOBJS): %$(OBJEXT): %.S
|
$(AOBJS): %$(OBJEXT): %.S
|
||||||
$(call ASSEMBLE, $<, $@)
|
$(call ASSEMBLE, $<, $@)
|
||||||
@@ -340,10 +340,9 @@ endif
|
|||||||
|
|
||||||
# This is part of the top-level export target
|
# This is part of the top-level export target
|
||||||
|
|
||||||
export_startup: board/libboard$(LIBEXT) up_head.o $(HOSTOBJS) nuttx-names.dat
|
export_startup: up_head.o $(HOSTOBJS) nuttx-names.dat
|
||||||
cp up_head.o $(HOSTOBJS) ${EXPORT_DIR}/startup
|
cp up_head.o $(HOSTOBJS) ${EXPORT_DIR}/startup
|
||||||
cp nuttx-names.dat ${EXPORT_DIR}/libs
|
cp nuttx-names.dat ${EXPORT_DIR}/libs
|
||||||
echo main NXmain >> ${EXPORT_DIR}/libs/nuttx-names.dat
|
|
||||||
|
|
||||||
# Dependencies
|
# Dependencies
|
||||||
|
|
||||||
|
|||||||
@@ -116,7 +116,7 @@ endif
|
|||||||
|
|
||||||
# This is part of the top-level export target
|
# This is part of the top-level export target
|
||||||
|
|
||||||
export_startup: board/libboard$(LIBEXT) $(STARTUP_OBJS)
|
export_startup: $(STARTUP_OBJS)
|
||||||
$(Q) if [ -d "$(EXPORT_DIR)/startup" ]; then \
|
$(Q) if [ -d "$(EXPORT_DIR)/startup" ]; then \
|
||||||
cp -f $(STARTUP_OBJS) "$(EXPORT_DIR)/startup"; \
|
cp -f $(STARTUP_OBJS) "$(EXPORT_DIR)/startup"; \
|
||||||
else \
|
else \
|
||||||
|
|||||||
@@ -112,7 +112,7 @@ endif
|
|||||||
|
|
||||||
# This is part of the top-level export target
|
# This is part of the top-level export target
|
||||||
|
|
||||||
export_startup: board/libboard$(LIBEXT) $(STARTUP_OBJS)
|
export_startup: $(STARTUP_OBJS)
|
||||||
$(Q) if [ -d "$(EXPORT_DIR)/startup" ]; then \
|
$(Q) if [ -d "$(EXPORT_DIR)/startup" ]; then \
|
||||||
cp -f $(STARTUP_OBJS) "$(EXPORT_DIR)/startup"; \
|
cp -f $(STARTUP_OBJS) "$(EXPORT_DIR)/startup"; \
|
||||||
else \
|
else \
|
||||||
|
|||||||
@@ -122,7 +122,7 @@ endif
|
|||||||
|
|
||||||
# This is part of the top-level export target
|
# This is part of the top-level export target
|
||||||
|
|
||||||
export_startup: board/libboard$(LIBEXT) $(STARTUP_OBJS)
|
export_startup: $(STARTUP_OBJS)
|
||||||
$(Q) if [ -d "$(EXPORT_DIR)/startup" ]; then \
|
$(Q) if [ -d "$(EXPORT_DIR)/startup" ]; then \
|
||||||
cp -f $(STARTUP_OBJS) "$(EXPORT_DIR)/startup"; \
|
cp -f $(STARTUP_OBJS) "$(EXPORT_DIR)/startup"; \
|
||||||
else \
|
else \
|
||||||
|
|||||||
@@ -129,7 +129,7 @@ endif
|
|||||||
|
|
||||||
# This is part of the top-level export target
|
# This is part of the top-level export target
|
||||||
|
|
||||||
export_startup: board/libboard$(LIBEXT) $(STARTUP_OBJS)
|
export_startup: $(STARTUP_OBJS)
|
||||||
$(Q) if [ -d "$(EXPORT_DIR)/startup" ]; then \
|
$(Q) if [ -d "$(EXPORT_DIR)/startup" ]; then \
|
||||||
cp -f $(STARTUP_OBJS) "$(EXPORT_DIR)/startup"; \
|
cp -f $(STARTUP_OBJS) "$(EXPORT_DIR)/startup"; \
|
||||||
else \
|
else \
|
||||||
|
|||||||
@@ -122,7 +122,7 @@ endif
|
|||||||
|
|
||||||
# This is part of the top-level export target
|
# This is part of the top-level export target
|
||||||
|
|
||||||
export_startup: board/libboard$(LIBEXT) $(STARTUP_OBJS)
|
export_startup: $(STARTUP_OBJS)
|
||||||
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
|
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
|
||||||
$(Q) if exist "$(EXPORT_DIR)$(DELIM)startup" ( copy $(STARTUP_OBJS) "$(EXPORT_DIR)$(DELIM)startup$(DELIM)." /b /y)
|
$(Q) if exist "$(EXPORT_DIR)$(DELIM)startup" ( copy $(STARTUP_OBJS) "$(EXPORT_DIR)$(DELIM)startup$(DELIM)." /b /y)
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -101,7 +101,7 @@ nuttx$(EXEEXT): $(HEAD_OBJ) board$(DELIM)libboard$(LIBEXT) $(LINKCMD)
|
|||||||
|
|
||||||
# This is part of the top-level export target
|
# This is part of the top-level export target
|
||||||
|
|
||||||
export_startup: board$(DELIM)libboard$(LIBEXT) $(STARTUP_OBJS)
|
export_startup: $(STARTUP_OBJS)
|
||||||
$(Q) if [ -d "$(EXPORT_DIR)$(DELIM)startup" ]; then \
|
$(Q) if [ -d "$(EXPORT_DIR)$(DELIM)startup" ]; then \
|
||||||
cp -f $(STARTUP_OBJS) "$(EXPORT_DIR)$(DELIM)startup"; \
|
cp -f $(STARTUP_OBJS) "$(EXPORT_DIR)$(DELIM)startup"; \
|
||||||
else \
|
else \
|
||||||
|
|||||||
@@ -185,7 +185,7 @@ endif
|
|||||||
|
|
||||||
# This is part of the top-level export target
|
# This is part of the top-level export target
|
||||||
|
|
||||||
export_startup: board/libboard$(LIBEXT) $(STARTUP_OBJS)
|
export_startup: $(STARTUP_OBJS)
|
||||||
$(Q) if [ -d "$(EXPORT_DIR)/startup" ]; then \
|
$(Q) if [ -d "$(EXPORT_DIR)/startup" ]; then \
|
||||||
cp -f $(STARTUP_OBJS) "$(EXPORT_DIR)/startup"; \
|
cp -f $(STARTUP_OBJS) "$(EXPORT_DIR)/startup"; \
|
||||||
else \
|
else \
|
||||||
|
|||||||
@@ -180,7 +180,7 @@ endif
|
|||||||
|
|
||||||
# This is part of the top-level export target
|
# This is part of the top-level export target
|
||||||
|
|
||||||
export_startup: board\libboard$(LIBEXT) $(STARTUP_OBJS)
|
export_startup: $(STARTUP_OBJS)
|
||||||
$(Q) if not exist board\Makefile ( echo $(EXPORT_DIR)\startup does not exist )
|
$(Q) if not exist board\Makefile ( echo $(EXPORT_DIR)\startup does not exist )
|
||||||
$(Q) if exist board\Makefile ( cp -f $(STARTUP_OBJS) "$(EXPORT_DIR)\startup" )
|
$(Q) if exist board\Makefile ( cp -f $(STARTUP_OBJS) "$(EXPORT_DIR)\startup" )
|
||||||
|
|
||||||
|
|||||||
@@ -130,7 +130,7 @@ nuttx$(EXEEXT): $(HEAD_OBJ) board$(DELIM)libboard$(LIBEXT) nuttx.linkcmd
|
|||||||
|
|
||||||
# This is part of the top-level export target
|
# This is part of the top-level export target
|
||||||
|
|
||||||
export_startup: board$(DELIM)libboard$(LIBEXT) $(STARTUP_OBJS)
|
export_startup: $(STARTUP_OBJS)
|
||||||
$(Q) if [ -d "$(EXPORT_DIR)$(DELIM)startup" ]; then \
|
$(Q) if [ -d "$(EXPORT_DIR)$(DELIM)startup" ]; then \
|
||||||
cp -f $(STARTUP_OBJS) "$(EXPORT_DIR)$(DELIM)startup"; \
|
cp -f $(STARTUP_OBJS) "$(EXPORT_DIR)$(DELIM)startup"; \
|
||||||
else \
|
else \
|
||||||
|
|||||||
@@ -117,7 +117,7 @@ nuttx$(EXEEXT): $(HEAD_OBJ) board$(DELIM)libboard$(LIBEXT) nuttx.linkcmd
|
|||||||
|
|
||||||
# This is part of the top-level export target
|
# This is part of the top-level export target
|
||||||
|
|
||||||
export_startup: board$(DELIM)libboard$(LIBEXT) $(STARTUP_OBJS)
|
export_startup: $(STARTUP_OBJS)
|
||||||
$(Q) if exist "$(EXPORT_DIR)$(DELIM)startup" ( copy $(STARTUP_OBJS) "$(EXPORT_DIR)$(DELIM)startup$(DELIM)." /b /y)
|
$(Q) if exist "$(EXPORT_DIR)$(DELIM)startup" ( copy $(STARTUP_OBJS) "$(EXPORT_DIR)$(DELIM)startup$(DELIM)." /b /y)
|
||||||
|
|
||||||
# Dependencies
|
# Dependencies
|
||||||
|
|||||||
Reference in New Issue
Block a user