Browse code
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 <jess@docker.com> (github: jfrazelle)
Jessica Frazelle authored on 2014/10/29 08:27:23Showing 1 changed files
| ... | ... |
@@ -95,7 +95,11 @@ if [ -z "$DOCKER_CLIENTONLY" ]; then |
| 95 | 95 |
fi |
| 96 | 96 |
|
| 97 | 97 |
# Use these flags when compiling the tests and final binary |
| 98 |
-LDFLAGS='-w' |
|
| 98 |
+LDFLAGS=' |
|
| 99 |
+ -w |
|
| 100 |
+ -X '$DOCKER_PKG'/dockerversion.GITCOMMIT "'$GITCOMMIT'" |
|
| 101 |
+ -X '$DOCKER_PKG'/dockerversion.VERSION "'$VERSION'" |
|
| 102 |
+' |
|
| 99 | 103 |
LDFLAGS_STATIC='-linkmode external' |
| 100 | 104 |
EXTLDFLAGS_STATIC='-static' |
| 101 | 105 |
# ORIG_BUILDFLAGS is necessary for the cross target which cannot always build |