Merge pull request #44755 from vvoland/buildflags-nopie-whenrace-2010

[20.10 backport] hack/make: Don't add -buildmode=pie with -race
moby · Jan 9, 2023 · 208fb1c · 208fb1c
2 parents 6ddb3ba + d645297
commit 208fb1c
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/hack/make/.binary b/hack/make/.binary
@@ -70,14 +70,17 @@ hash_files() {
 		esac
 	fi
 
-	# -buildmode=pie is not supported on Windows and Linux on mips and riscv64.
-	case "$(go env GOOS)/$(go env GOARCH)" in
-		windows/* | linux/mips* | linux/riscv*) ;;
+	# -buildmode=pie not supported when -race is enabled
+	if [[ " $BUILDFLAGS " != *" -race "* ]]; then
+		# -buildmode=pie is not supported on Windows and Linux on mips and riscv64.
+		case "$(go env GOOS)/$(go env GOARCH)" in
+			windows/* | linux/mips* | linux/riscv*) ;;
 
-		*)
-			BUILDFLAGS+=("-buildmode=pie")
-			;;
-	esac
+			*)
+				BUILDFLAGS+=("-buildmode=pie")
+				;;
+		esac
+	fi
 
 	echo "Building: $DEST/$BINARY_FULLNAME"
 	echo "GOOS=\"${GOOS}\" GOARCH=\"${GOARCH}\" GOARM=\"${GOARM}\""