From ed20cebfec648920c59e0988aceeef7dfd646558 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Thu, 8 Apr 2021 18:55:40 +1000 Subject: [PATCH] makefile: fix bad build flags Fix mistake in the Makefile which prevents the version field (as well as some other build flags) from being passed to "go build". Fixes: 6fbd32e48b66 ("Make Makefile more portable") Signed-off-by: Aleksa Sarai --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d760e9289033..1fdcf650f4f9 100644 --- a/Makefile +++ b/Makefile @@ -71,7 +71,7 @@ BASE_LDFLAGS := -s -w -X ${PROJECT}.gitCommit=${COMMIT} -X ${PROJECT}.version=${ # Specific build flags for build type. ifeq ($(GOOS), linux) - TEST_BUILD_FLAGS := ${BASE_FLAGS} -buildmode=pie -ldflags "${BASE_LDFLAGS} -X ${PROJECT}/pkg/testutils.binaryType=test" DYN_BUILD_FLAGS := ${BASE_FLAGS} -buildmode=pie -ldflags "${BASE_LDFLAGS}" + DYN_BUILD_FLAGS := ${BASE_FLAGS} -buildmode=pie -ldflags "${BASE_LDFLAGS}" TEST_BUILD_FLAGS := ${BASE_FLAGS} -buildmode=pie -ldflags "${BASE_LDFLAGS} -X ${PROJECT}/pkg/testutils.binaryType=test" else DYN_BUILD_FLAGS := ${BASE_FLAGS} -ldflags "${BASE_LDFLAGS}" -- 2.30.2