Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use viceroy for armv7 builds #136

Merged
merged 1 commit into from
Aug 24, 2023
Merged

Use viceroy for armv7 builds #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions containers/build_backend.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,10 @@ type CompileBackendOpts struct {
}

func goBuildImage(distro executil.Distribution, opts *executil.GoBuildOpts, goVersion string) string {
os, _ := executil.OSAndArch(distro)
os, arch := executil.OSAndArch(distro)

if os != "linux" {
// For arm/v7 and arm/v6 we want to use viceroy
if os != "linux" || arch == "arm" {
return ViceroyImage
}

Expand Down
4 changes: 2 additions & 2 deletions containers/build_backend_platforms.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ func BuildOptsDynamicARM(distro executil.Distribution, buildinfo *BuildInfo) *ex
)

return &executil.GoBuildOpts{
CC: ZigCC(distro),
CXX: ZigCXX(distro),
// CC: ZigCC(distro),
// CXX: ZigCXX(distro),
ExperimentalFlags: []string{},
OS: os,
Arch: "arm",
Expand Down
Loading