Skip to content

Commit

Permalink
Merge pull request moby#12992 from aidanhs/aphs-easy-debug-build
Browse files Browse the repository at this point in the history
Allow passing DOCKER_DEBUG= to `make`
  • Loading branch information
Jessie Frazelle committed Jun 8, 2015
2 parents 4ad05ed + a121ac8 commit 75f6349
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
DOCKER_ENVS := \
-e BUILDFLAGS \
-e DOCKER_CLIENTONLY \
-e DOCKER_DEBUG \
-e DOCKER_EXECDRIVER \
-e DOCKER_EXPERIMENTAL \
-e DOCKER_GRAPHDRIVER \
Expand Down
4 changes: 3 additions & 1 deletion hack/make.sh
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,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.
Expand Down

0 comments on commit 75f6349

Please sign in to comment.