Pārlūkot izejas kodu

Merge pull request #44748 from vvoland/buildflags-nopie-whenrace

hack/make: Don't add -buildmode=pie with -race
Sebastiaan van Stijn 2 gadi atpakaļ
vecāks
revīzija
57af88a654
1 mainītis faili ar 9 papildinājumiem un 6 dzēšanām
  1. 9 6
      hack/make/.binary

+ 9 - 6
hack/make/.binary

@@ -74,12 +74,15 @@ source "${MAKEDIR}/.go-autogen"
 	# -buildmode=pie is not supported on Windows arm64 and Linux mips*, ppc64be
 	# https://github.com/golang/go/blob/go1.19.4/src/cmd/internal/sys/supported.go#L125-L132
 	if ! [ "$DOCKER_STATIC" = "1" ]; then
-		case "$(go env GOOS)/$(go env GOARCH)" in
-			windows/arm64 | linux/mips* | linux/ppc64) ;;
-			*)
-				BUILDFLAGS+=("-buildmode=pie")
-				;;
-		esac
+		# -buildmode=pie not supported when -race is enabled
+		if [[ " $BUILDFLAGS " != *" -race "* ]]; then
+			case "$(go env GOOS)/$(go env GOARCH)" in
+				windows/arm64 | linux/mips* | linux/ppc64) ;;
+				*)
+					BUILDFLAGS+=("-buildmode=pie")
+					;;
+			esac
+		fi
 	fi
 
 	# only necessary for non-sandboxed invocation where TARGETPLATFORM is empty