From 24c807a941301c3b74c908070032b86a25ad820a Mon Sep 17 00:00:00 2001
From: Arsen Musayelyan <moussaelianarsen@gmail.com>
Date: Sun, 20 Nov 2022 13:57:59 -0800
Subject: [PATCH] Resolve ARM variant in the value of the  environment variable

---
 build.go | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/build.go b/build.go
index 0ae7aee..3a83136 100644
--- a/build.go
+++ b/build.go
@@ -462,6 +462,12 @@ func buildPackage(ctx context.Context, script string, mgr manager.Manager) ([]st
 
 func genBuildEnv(info *distro.OSRelease) []string {
 	env := os.Environ()
+
+	arch := runtime.GOARCH
+	if arch == "arm" {
+		arch = cpu.ARMVariant()
+	}
+
 	env = append(
 		env,
 		"DISTRO_NAME="+info.Name,
@@ -469,7 +475,7 @@ func genBuildEnv(info *distro.OSRelease) []string {
 		"DISTRO_ID="+info.ID,
 		"DISTRO_VERSION_ID="+info.VersionID,
 
-		"ARCH="+runtime.GOARCH,
+		"ARCH="+arch,
 		"NCPU="+strconv.Itoa(runtime.NumCPU()),
 	)