Skip to content

Commit

Permalink
native: only set TERMFLAGS for pyterm
Browse files Browse the repository at this point in the history
If TERMPROG is unset the default is pyterm. If TERMPROG is pyterm we
need to set the native flag.
  • Loading branch information
OlegHahm committed Dec 13, 2023
1 parent 84b9985 commit 4b101b1
Showing 1 changed file with 17 additions and 1 deletion.
18 changes: 17 additions & 1 deletion boards/native/Makefile.include
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,23 @@ RESET ?= $(RIOTBOARD)/native/dist/reset.sh
FLASHER ?=
FLASHFILE ?= $(ELFFILE)

TERMFLAGS ?= -n $(FLASHFILE)
SETPYTERMFLAGS := 0
ifdef RIOT_TERMINAL
SETPYTERMFLAGS = 0
else ifdef TERMPROG
SETPYTERMFLAGS = 0
else
SETPYTERMFLAGS = 1
endif
ifneq (,$(findstring pyterm,$(TERMPROG)))
SETPYTERMFLAGS = 1
endif

ifeq (1, $(SETPYTERMFLAGS))
TERMFLAGS += -n $(FLASHFILE)
else
TERMPROG ?= $(FLASHFILE)
endif

export VALGRIND ?= valgrind
export CGANNOTATE ?= cg_annotate
Expand Down

0 comments on commit 4b101b1

Please sign in to comment.