From 21758fe067a3bb51b1279619718f589d82911a39 Mon Sep 17 00:00:00 2001 From: Aidan Hobson Sayers Date: Thu, 7 May 2015 13:22:44 +0100 Subject: [PATCH] Restore DEBUG as DOCKER_DEBUG (removed in #10665), add as make variable Signed-off-by: Aidan Hobson Sayers Upstream-commit: a121ac858e9b08aff0c6709337e5150b01851ffd Component: engine --- components/engine/Makefile | 1 + components/engine/hack/make.sh | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/components/engine/Makefile b/components/engine/Makefile index b98424b6c0..976614ce39 100644 --- a/components/engine/Makefile +++ b/components/engine/Makefile @@ -6,6 +6,7 @@ DOCKER_ENVS := \ -e BUILDFLAGS \ -e DOCKER_CLIENTONLY \ + -e DOCKER_DEBUG \ -e DOCKER_EXECDRIVER \ -e DOCKER_GRAPHDRIVER \ -e DOCKER_STORAGE_OPTS \ diff --git a/components/engine/hack/make.sh b/components/engine/hack/make.sh index b9c2aef6a8..3c4363fd46 100755 --- a/components/engine/hack/make.sh +++ b/components/engine/hack/make.sh @@ -122,7 +122,9 @@ fi IAMSTATIC='true' source "$SCRIPTDIR/make/.go-autogen" -LDFLAGS='-w' +if [ -z "$DOCKER_DEBUG" ]; then + LDFLAGS='-w' +fi LDFLAGS_STATIC='-linkmode external' # Cgo -H windows is incompatible with -linkmode external.