From 96746238b2cdff0c2bdf1dc8e31eb396e6159911 Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Wed, 18 Jan 2023 20:14:52 +0100 Subject: [PATCH] hack: remove ORIG_BUILDFLAGS var This var was used for the cross target but it has been removed in 8086f4012330d1c1058e07fc4e5e4522dd432c20 so not necessary anymore Signed-off-by: CrazyMax (cherry picked from commit b80f16157e7ce98eeeb874c575bb34a1caa88e8d) Signed-off-by: Sebastiaan van Stijn --- hack/make.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/hack/make.sh b/hack/make.sh index 94972e4138..a7ace86767 100755 --- a/hack/make.sh +++ b/hack/make.sh @@ -112,11 +112,7 @@ fi 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") - -BUILDFLAGS=(${BUILDFLAGS} "${ORIG_BUILDFLAGS[@]}") +BUILDFLAGS=(${BUILDFLAGS} -tags "netgo osusergo static_build $DOCKER_BUILDTAGS") LDFLAGS_STATIC_DOCKER=" $LDFLAGS_STATIC