From df2fe7004901d0572d8c90c86fcae3e438dcafd6 Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Wed, 18 Jan 2023 20:12:23 +0100 Subject: [PATCH] hack: remove -installsuffix build flag Has been introduced in 232d59baeb13778abc242a602ca434d83e1eb6e8 to work around a bug with "go build" but not required anymore since go 1.5: https://github.com/golang/go/commit/4dab6d01f12591f256d36b32cd6480ef679458f1 Signed-off-by: CrazyMax (cherry picked from commit 0c008cc4f8c059752c7b31cfc5ed7d05baee97be) Signed-off-by: Sebastiaan van Stijn --- hack/make.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hack/make.sh b/hack/make.sh index b30f3d6e44..94972e4138 100755 --- a/hack/make.sh +++ b/hack/make.sh @@ -114,8 +114,7 @@ LDFLAGS_STATIC='' EXTLDFLAGS_STATIC='-static' # ORIG_BUILDFLAGS is necessary for the cross target which cannot always build # with options like -race. -ORIG_BUILDFLAGS=(-tags "netgo osusergo static_build $DOCKER_BUILDTAGS" -installsuffix netgo) -# see https://github.com/golang/go/issues/9369#issuecomment-69864440 for why -installsuffix is necessary here +ORIG_BUILDFLAGS=(-tags "netgo osusergo static_build $DOCKER_BUILDTAGS") BUILDFLAGS=(${BUILDFLAGS} "${ORIG_BUILDFLAGS[@]}")