From 9c9cc5ec431b2dd69362dbe712adef3314b674fe Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 4 May 2017 07:13:09 -0700 Subject: [PATCH] Only set DOCKER_CROSSPLATFORMS from env if it's set This allows for the default to come from the image/`Dockerfile` rather than being unconditionally overwritten by the environment. Signed-off-by: Andrew "Tianon" Page --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 78be642b23..9fa993b635 100644 --- a/Makefile +++ b/Makefile @@ -17,13 +17,13 @@ export DOCKER_GITCOMMIT # to allow things like `make KEEPBUNDLE=1 binary` easily # `project/PACKAGERS.md` have some limited documentation of some of these DOCKER_ENVS := \ + $(if $(DOCKER_CROSSPLATFORMS), -e DOCKER_CROSSPLATFORMS) \ -e BUILD_APT_MIRROR \ -e BUILDFLAGS \ -e KEEPBUNDLE \ -e DOCKER_BUILD_ARGS \ -e DOCKER_BUILD_GOGC \ -e DOCKER_BUILD_PKGS \ - -e DOCKER_CROSSPLATFORMS \ -e DOCKER_DEBUG \ -e DOCKER_EXPERIMENTAL \ -e DOCKER_GITCOMMIT \