mirror of
https://github.com/RIOT-OS/RIOT.git
synced 2024-12-29 04:50:03 +01:00
Merge pull request #10543 from jcarrano/no-building-with-different-version
Makefile.include: remove functionality to build with another version.
This commit is contained in:
commit
bb97c05b36
@ -154,8 +154,6 @@ ifeq ($(WPEDANTIC),1)
|
||||
CFLAGS += -Wpedantic
|
||||
endif
|
||||
|
||||
ifneq (10,$(if $(RIOT_VERSION),1,0)$(if $(__RIOTBUILD_FLAG),1,0))
|
||||
|
||||
# Provide a shallow sanity check. You cannot call `make` in a module directory.
|
||||
export __RIOTBUILD_FLAG := RIOT
|
||||
|
||||
@ -658,35 +656,6 @@ ifneq (, $(filter all flash, $(if $(MAKECMDGOALS), $(MAKECMDGOALS), all)))
|
||||
|
||||
endif
|
||||
|
||||
else # RIOT_VERSION
|
||||
|
||||
export __RIOTBUILD_FLAG := RIOT
|
||||
|
||||
NUM_RIOT_VERSION := $(shell cd $(RIOTBASE) && git rev-parse --verify --short "$(RIOT_VERSION)" 2>/dev/null)
|
||||
ifeq (, $(NUM_RIOT_VERSION))
|
||||
$(error The supplied RIOT_VERSION=$(RIOT_VERSION) is invalid!)
|
||||
endif
|
||||
|
||||
all $(filter-out clean, $(MAKECMDGOALS)): ..delegate
|
||||
ifneq (, $(filter clean, $(MAKECMDGOALS)))
|
||||
all $(filter-out clean, $(MAKECMDGOALS)): clean
|
||||
endif
|
||||
|
||||
clean:
|
||||
-$(Q)rm -rf $(BINDIR)
|
||||
|
||||
$(BINDIR)/riot-version/$(NUM_RIOT_VERSION)/Makefile.include:
|
||||
$(Q)rm -rf $(@D)
|
||||
$(Q)mkdir -p $(@D)
|
||||
$(Q)cd $(RIOTBASE) && git archive --format=tar $(NUM_RIOT_VERSION) | ( cd $(@D) && tar x 1>&2 )
|
||||
|
||||
..delegate: $(BINDIR)/riot-version/$(NUM_RIOT_VERSION)/Makefile.include
|
||||
@$(COLOR_ECHO) '$(COLOR_GREEN)Using RIOT_VERSION=$(NUM_RIOT_VERSION)$(COLOR_RESET)' 1>&2
|
||||
@$(COLOR_ECHO)
|
||||
$(MAKE) RIOTBASE=$(<D) $(filter-out clean, $(MAKECMDGOALS))
|
||||
|
||||
endif
|
||||
|
||||
help:
|
||||
@$(MAKE) -qp | sed -ne 's/\(^[a-z][a-z_-]*\):.*/\1/p' | sort | uniq
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user