From 7041eb00be7d6224aeedf7db317667b1d121b54d Mon Sep 17 00:00:00 2001 From: Jessica Frazelle Date: Tue, 28 Oct 2014 16:29:01 -0700 Subject: [PATCH] Revert "finally, use code generation for INITSHA1 & INITPATH too" This reverts commit c7c620dd9fce0e7b437ee185c7a58341f3b8e3aa. Conflicts: .gitignore hack/make.sh hack/make/dynbinary Docker-DCO-1.1-Signed-off-by: Jessica Frazelle (github: jfrazelle) --- hack/make/dyntest-integration | 12 +++--------- hack/make/dyntest-unit | 12 +++--------- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/hack/make/dyntest-integration b/hack/make/dyntest-integration index 5015c10969..1cc7349aba 100644 --- a/hack/make/dyntest-integration +++ b/hack/make/dyntest-integration @@ -11,14 +11,8 @@ fi ( export TEST_DOCKERINIT_PATH="$INIT" - export LDFLAGS_STATIC_DOCKER="" - cat > dockerversion/init.go < dockerversion/init.go <