diff options
| author | Michael Hudson-Doyle <michael.hudson@linaro.org> | 2014-10-08 15:31:43 +1300 |
|---|---|---|
| committer | Michael Hudson-Doyle <michael.hudson@linaro.org> | 2014-10-24 11:01:19 +1300 |
| commit | c7c620dd9fce0e7b437ee185c7a58341f3b8e3aa (patch) | |
| tree | 8e4a204e47fbdabf3e1f3a86bde2e6c293672531 /hack/make/dynbinary | |
| parent | 85744a35de0e30c2dd6741b833f38ff218c8a3fc (diff) | |
| download | docker-c7c620dd9fce0e7b437ee185c7a58341f3b8e3aa.tar.gz | |
finally, use code generation for INITSHA1 & INITPATH too
Signed-off-by: Michael Hudson-Doyle <michael.hudson@linaro.org>
Diffstat (limited to 'hack/make/dynbinary')
| -rw-r--r-- | hack/make/dynbinary | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/hack/make/dynbinary b/hack/make/dynbinary index bcb4471498..171dd16ba3 100644 --- a/hack/make/dynbinary +++ b/hack/make/dynbinary @@ -47,7 +47,16 @@ fi # exported so that "dyntest" can easily access it later without recalculating it ( - export LDFLAGS_STATIC_DOCKER="-X $DOCKER_PKG/dockerversion.INITSHA1 \"$DOCKER_INITSHA1\" -X $DOCKER_PKG/dockerversion.INITPATH \"$DOCKER_INITPATH\"" + export LDFLAGS_STATIC_DOCKER="" + cat > dockerversion/init.go <<EOF +// AUTOGENERATED FILE; see hack/make/dynbinary, hack/make/dyntest-integration and dyntest-unit +package dockerversion + +func init() { + INITSHA1 = "$DOCKER_INITSHA1" + INITPATH = "$DOCKER_INITPATH" +} +EOF export IAMSTATIC=false export BUILDFLAGS=( "${BUILDFLAGS[@]/netgo /}" ) # disable netgo, since we don't need it for a dynamic binary source "$(dirname "$BASH_SOURCE")/binary" |