From fd1ccb57079131ae316723fcfe6928b063c53697 Mon Sep 17 00:00:00 2001
From: dbenoit <dbenoit@redhat.com>
Date: Thu, 14 May 2026 09:41:31 -0400
Subject: [PATCH] Set conditional ISA for bootstrap

Related: RHEL-175604
---
 golang.spec | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/golang.spec b/golang.spec
index f146775..b8d92a1 100644
--- a/golang.spec
+++ b/golang.spec
@@ -425,7 +425,7 @@ popd
 cp "${tsan_go_dir}"/race_linux_amd64.syso ./src/runtime/race/internal/amd64v3/race_linux.syso
 
 pushd "${tsan_go_dir}"
-  CFLAGS="%{tsan_buildflags} %{tsan_optflag}" CC=clang GOAMD64=v3 ./buildgo.sh
+  CFLAGS="%{tsan_buildflags} %{tsan_optflag}" CC=clang GOAMD64=v1 ./buildgo.sh
 popd
 cp "${tsan_go_dir}"/race_linux_amd64.syso ./src/runtime/race/internal/amd64v1/race_linux.syso
 
@@ -449,8 +449,8 @@ export GOROOT_FINAL=%{goroot}
 
 export GOHOSTOS=linux
 export GOHOSTARCH=%{gohostarch}
-export GOAMD64=v3
-export GOPPC64='power9'
+export GOAMD64=%{goamd64}
+export GOPPC64=%{goppc64}
 
 pushd src
 # use our gcc options for this build, but store gcc as default for compiler
@@ -460,8 +460,8 @@ export CC="gcc"
 export CC_FOR_TARGET="gcc"
 export GOOS=linux
 export GOARCH=%{gohostarch}
-export GOAMD64=v3
-export GOPPC64='power9'
+export GOAMD64=%{goamd64}
+export GOPPC64=%{goppc64}
 
 DEFAULT_GO_LD_FLAGS=""
 %if !%{external_linker}
@@ -618,8 +618,8 @@ go env
 export CC="gcc"
 export CFLAGS="$RPM_OPT_FLAGS"
 export LDFLAGS="$RPM_LD_FLAGS"
-export GOAMD64=v3
-export GOPPC64='power9'
+export GOAMD64=%{goamd64}
+export GOPPC64=%{goppc64}
 %if !%{external_linker}
 export GO_LDFLAGS="-linkmode internal"
 %else