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

Makefile.include: don't define GITCACHE and GIT_CACHE_DIR globally

Browse Source
This commit is contained in:
Alexandre Abadie 2020-06-10 18:47:48 +02:00
parent 6b3f241be2
commit df58141e15
No known key found for this signature in database
GPG Key ID: 1C919A403CAE1405
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.include
View File

@ -41,8 +41,6 @@ RIOTMAKE ?= $(RIOTBASE)/makefiles
RIOTPKG ?= $(RIOTBASE)/pkg RIOTPKG ?= $(RIOTBASE)/pkg
RIOTTOOLS ?= $(RIOTBASE)/dist/tools RIOTTOOLS ?= $(RIOTBASE)/dist/tools
RIOTPROJECT ?= $(shell git rev-parse --show-toplevel 2>/dev/null || pwd) RIOTPROJECT ?= $(shell git rev-parse --show-toplevel 2>/dev/null || pwd)
GITCACHE ?= $(RIOTTOOLS)/git/git-cache
GIT_CACHE_DIR ?= $(HOME)/.gitcache
BUILD_DIR ?= $(RIOTBASE)/build BUILD_DIR ?= $(RIOTBASE)/build
APPDIR ?= $(CURDIR) APPDIR ?= $(CURDIR)
BINDIRBASE ?= $(APPDIR)/bin BINDIRBASE ?= $(APPDIR)/bin
@ -65,7 +63,6 @@ __DIRECTORY_VARIABLES := \
BUILD_DIR \ BUILD_DIR \
BINDIRBASE \ BINDIRBASE \
BINDIR \ BINDIR \
GITCACHE \
PKGDIRBASE \ PKGDIRBASE \
DLCACHE_DIR \ DLCACHE_DIR \
# #
@ -115,7 +112,6 @@ override RIOTMAKE := $(abspath $(RIOTMAKE))
override RIOTPKG := $(abspath $(RIOTPKG)) override RIOTPKG := $(abspath $(RIOTPKG))
override RIOTTOOLS := $(abspath $(RIOTTOOLS)) override RIOTTOOLS := $(abspath $(RIOTTOOLS))
override RIOTPROJECT := $(abspath $(RIOTPROJECT)) override RIOTPROJECT := $(abspath $(RIOTPROJECT))
override GITCACHE := $(abspath $(GITCACHE))
override APPDIR := $(abspath $(APPDIR)) override APPDIR := $(abspath $(APPDIR))
override BUILD_DIR := $(abspath $(BUILD_DIR)) override BUILD_DIR := $(abspath $(BUILD_DIR))
override BINDIRBASE := $(abspath $(BINDIRBASE)) override BINDIRBASE := $(abspath $(BINDIRBASE))

4
makefiles/vars.inc.mk
View File

@ -81,8 +81,8 @@ export WERROR # Treat all compiler warnings as errors if set to 1
export WPEDANTIC # Issue all (extensive) compiler warnings demanded by strict C/C++ export WPEDANTIC # Issue all (extensive) compiler warnings demanded by strict C/C++
# EEPROM_FILE # (Native only!) file path where the content of the EEPROM is stored # EEPROM_FILE # (Native only!) file path where the content of the EEPROM is stored
export GITCACHE # path to git-cache executable # GITCACHE # path to git-cache executable
export GIT_CACHE_DIR # path to git-cache cache directory # GIT_CACHE_DIR # path to git-cache cache directory, only used with packages
# FLASHER # The command to call on "make flash". # FLASHER # The command to call on "make flash".
# PROG_DEV # The device to connect the FLASHER and DEBUGGER # PROG_DEV # The device to connect the FLASHER and DEBUGGER
# FFLAGS # The parameters to supply to FLASHER. # FFLAGS # The parameters to supply to FLASHER.