Merge pull request #324 from bowei/fix-build

Fix build to only build the executable target
kubernetes · Jun 8, 2018 · 97d4099 · 97d4099
2 parents 736e0e3 + fc80b58
commit 97d4099
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 29 deletions.
diff --git a/build/build.sh b/build/build.sh
@@ -42,14 +42,11 @@ if [ $GOARCH == "amd64" ]; then
     export GOBIN="$GOPATH/bin/linux_amd64"
 fi
 
+BIN_PKG="$PKG/cmd/$(basename ${TARGET})"
+LD_FLAGS="-X ${PKG}/pkg/version.Version=${VERSION} -X ${PKG}/pkg/version.GitCommit=${GIT_COMMIT}"
+
 if echo "${TARGET}" | grep '.*-test$'; then
-  go test -c          \
-    -ldflags "-X ${PKG}/pkg/version.Version=${VERSION} -X ${PKG}/pkg/version.GitCommit=${GIT_COMMIT}" \
-    -o "${TARGET}"    \
-    "$PKG/cmd/$(basename ${TARGET})"
+  go test -c -ldflags "${LD_FLAGS}" -o "${TARGET}" "${BIN_PKG}"
 else
-  go install                                                                                             \
-      -installsuffix "static"                                                                            \
-      -ldflags "-X ${PKG}/pkg/version.Version=${VERSION} -X ${PKG}/pkg/version.GitCommit=${GIT_COMMIT}"  \
-      ./...
+  go install -i -installsuffix "static" -ldflags "${LD_FLAGS}" "${BIN_PKG}"
 fi
diff --git a/build/rules.mk b/build/rules.mk
@@ -125,7 +125,8 @@ $(GO_BINARIES): build-dirs
 			TARGET=$@                                                      \
 		GIT_COMMIT=$(GIT_COMMIT)                                           \
 	        ./build/build.sh                                               \
-	    "
+	    "                                                                  \
+		$(VERBOSE_OUTPUT)
 
 # Rules for dockerfiles.
 define DOCKERFILE_RULE

diff --git a/cmd/e2e-test/placeholder.go b/cmd/e2e-test/placeholder.go