Prechádzať zdrojové kódy

hack/make: Don't add -buildmode=pie with -race

Make it possible to add `-race` to the BUILDFLAGS without making the
build fail with error:
"-buildmode=pie not supported when -race is enabled"

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
Paweł Gronowski 2 rokov pred
rodič
commit
d645297358
1 zmenil súbory, kde vykonal 10 pridanie a 7 odobranie
  1. 10 7
      hack/make/.binary

+ 10 - 7
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}\""