From ec1420cc2b228116d4aa9c812bd98fa8acdc1b98 Mon Sep 17 00:00:00 2001 From: Jessica Frazelle Date: Tue, 28 Oct 2014 16:27:23 -0700 Subject: [PATCH] Revert "use code generation for GITCOMMIT/VERSION too" This reverts commit 85744a35de0e30c2dd6741b833f38ff218c8a3fc. Conflicts: .gitignore hack/make.sh Docker-DCO-1.1-Signed-off-by: Jessica Frazelle (github: jfrazelle) --- hack/make.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hack/make.sh b/hack/make.sh index f97633de57..d6da3057fa 100755 --- a/hack/make.sh +++ b/hack/make.sh @@ -95,7 +95,11 @@ if [ -z "$DOCKER_CLIENTONLY" ]; then fi # Use these flags when compiling the tests and final binary -LDFLAGS='-w' +LDFLAGS=' + -w + -X '$DOCKER_PKG'/dockerversion.GITCOMMIT "'$GITCOMMIT'" + -X '$DOCKER_PKG'/dockerversion.VERSION "'$VERSION'" +' LDFLAGS_STATIC='-linkmode external' EXTLDFLAGS_STATIC='-static' # ORIG_BUILDFLAGS is necessary for the cross target which cannot always build