riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #12302 from fjmolinas/pr_build_files

Browse Source 
Makefile.include: add BUILD_FILES variable that holds all files to be built
This commit is contained in:
Alexandre Abadie 2019-09-30 14:26:24 +02:00 committed by GitHub
commit fe6d892969
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.include
View File

@ -451,6 +451,9 @@ ifeq (,$(FLASHFILE))
$(error FLASHFILE is not defined for this board: $(FLASHFILE)) $(error FLASHFILE is not defined for this board: $(FLASHFILE))
endif endif
# By default always build ELFFILE and FLASHFILE
BUILD_FILES += $(ELFFILE) $(FLASHFILE)
# variables used to compile and link c++ # variables used to compile and link c++
CPPMIX ?= $(if $(wildcard *.cpp),1,) CPPMIX ?= $(if $(wildcard *.cpp),1,)
@ -479,7 +482,7 @@ ifeq ($(BUILD_IN_DOCKER),1)
link: ..in-docker-container link: ..in-docker-container
else else
ifeq (,$(RIOTNOLINK)) ifeq (,$(RIOTNOLINK))
link: ..compiler-check ..build-message $(ELFFILE) $(FLASHFILE) print-size link: ..compiler-check ..build-message $(BUILD_FILES) print-size
else else
link: ..compiler-check ..build-message $(BASELIBS) link: ..compiler-check ..build-message $(BASELIBS)
endif # RIOTNOLINK endif # RIOTNOLINK

4
makefiles/boot/riotboot.mk
View File

@ -49,9 +49,7 @@ SLOT_RIOT_ELFS = $(BINDIR_APP)-slot0.elf $(BINDIR_APP)-slot1.elf
# ensure both slot elf files are always linked # ensure both slot elf files are always linked
# this ensures that both "make test" and "make test-murdock" can rely on them # this ensures that both "make test" and "make test-murdock" can rely on them
# being present without having to trigger re-compilation. # being present without having to trigger re-compilation.
ifneq (1, $(RIOTNOLINK)) BUILD_FILES += $(SLOT_RIOT_ELFS)
link: $(SLOT_RIOT_ELFS)
endif
# Create binary target with RIOT header # Create binary target with RIOT header
$(SLOT_RIOT_BINS): %.$(APP_VER).riot.bin: %.hdr %.bin $(SLOT_RIOT_BINS): %.$(APP_VER).riot.bin: %.hdr %.bin

1
makefiles/vars.inc.mk
View File

@ -80,6 +80,7 @@ export ELFFILE # The unstripped result of the compilation.
export HEXFILE # The 'intel hex' stripped result of the compilation. export HEXFILE # The 'intel hex' stripped result of the compilation.
# BINFILE # The 'binary' stripped result of the compilation. # BINFILE # The 'binary' stripped result of the compilation.
# FLASHFILE # The output file used for flashing # FLASHFILE # The output file used for flashing
# BUILD_FILES # The list of files to be built
# DEBUGGER # The command to call on "make debug", usually a script starting the GDB front-end. # DEBUGGER # The command to call on "make debug", usually a script starting the GDB front-end.
# DEBUGGER_FLAGS # The parameters to supply to DEBUGGER. # DEBUGGER_FLAGS # The parameters to supply to DEBUGGER.
# DEBUGSERVER # The command to call on "make debug-server", usually a script starting the GDB server. # DEBUGSERVER # The command to call on "make debug-server", usually a script starting the GDB server.