From e83966c80fd78ccb8d9d42f476cb24d3b9997e99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Harter?= Date: Mon, 19 Aug 2019 16:46:22 +0200 Subject: [PATCH] makefiles/docker.inc.mk: allow setting DOCKER_ENV_VARS from environment This allows setting other variables that should be exported to the docker build. As for other variables, they must still be unmodified before parsing `docker.inc.mk` to be exported. --- makefiles/docker.inc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefiles/docker.inc.mk b/makefiles/docker.inc.mk index c620437aaf..7886af50af 100644 --- a/makefiles/docker.inc.mk +++ b/makefiles/docker.inc.mk @@ -25,7 +25,7 @@ export DOCKER_MAKECMDGOALS ?= all # List of all exported environment variables that shall be passed on to the # Docker container, they will only be passed if they are set from the # environment, not if they are only default Makefile values. -export DOCKER_ENV_VARS = \ +export DOCKER_ENV_VARS += \ APPDIR \ AR \ ARFLAGS \