introduce zig cc cross-compilation setup for GitHub Actions and local development
#2535
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| .PHONY: build test clean | ||
|
|
||
| build: bin/zigcc | ||
|
|
||
| # always build for linux and the machine's native architecture | ||
| bin/zigcc: *.go go.mod | ||
| GOOS=linux go build -o $@ -ldflags="-s -w" -v ./... | ||
|
|
||
| test: | ||
| go test -v ./... | ||
|
|
||
| fmt: | ||
| go fmt ./... | ||
|
|
||
| vet: | ||
| go vet ./... | ||
|
|
||
| clean: | ||
| go clean | ||
| rm -f bin/* | ||
| rmdir bin |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| @@ -0,0 +1,3 @@ | ||||||||||||||
| module zigcc | ||||||||||||||
|
|
||||||||||||||
| go 1.24 | ||||||||||||||
|
Comment on lines
+1
to
+3
Contributor
There was a problem hiding this comment. Target a released Go toolchain
-go 1.24
+go 1.22📝 Committable suggestion
Suggested change
🤖 Prompt for AI Agents |
||||||||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| package main | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "os" | ||
| "path/filepath" | ||
| "strings" | ||
| "syscall" | ||
| ) | ||
|
|
||
| func processArg0(arg0 string) (string, error) { | ||
| switch arg0 { | ||
| case "zig-cc": | ||
| return "cc", nil | ||
| case "zig-c++": | ||
| return "c++", nil | ||
| default: | ||
| return "", fmt.Errorf("unknown wrapper name: %s", arg0) | ||
| } | ||
| } | ||
|
|
||
| func processArgs(args []string) []string { | ||
| newArgs := make([]string, 0, len(args)) | ||
| for _, arg := range args { | ||
| if strings.HasPrefix(arg, "-Wp,") { | ||
| newArgs = append(newArgs, strings.Split(arg, ",")[1:]...) | ||
| } else { | ||
| newArgs = append(newArgs, arg) | ||
| } | ||
| } | ||
| return newArgs | ||
| } | ||
|
|
||
| func main() { | ||
| arg0 := filepath.Base(os.Args[0]) | ||
| subcommand, err := processArg0(arg0) | ||
| if err != nil { | ||
| fmt.Fprintf(os.Stderr, "Error: %v\n", err) | ||
| os.Exit(1) | ||
| } | ||
|
|
||
| newArgs := make([]string, 0, len(os.Args)+4) | ||
| newArgs = append(newArgs, | ||
| "/mnt/zig", // Path to the real Zig executable. | ||
| subcommand, | ||
| "-target", | ||
| "s390x-linux-gnu.2.34", | ||
| ) | ||
| newArgs = append(newArgs, processArgs(os.Args[1:])...) | ||
|
|
||
| env := os.Environ() | ||
| if err := syscall.Exec(newArgs[0], newArgs, env); err != nil { | ||
| fmt.Fprintf(os.Stderr, "Error executing zig: %v\n", err) | ||
| os.Exit(1) | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| package main | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "reflect" | ||
| "testing" | ||
| ) | ||
|
|
||
| func TestProcessWp(t *testing.T) { | ||
| args := []string{"-Wp,-D_FORTIFY_SOURCE=2"} | ||
| newArgs := processArgs(args) | ||
| if !reflect.DeepEqual(newArgs, []string{"-D_FORTIFY_SOURCE=2"}) { | ||
| t.Fatalf("expected -DFOO=bar, got %v", newArgs) | ||
| } | ||
| for _, tc := range []struct { | ||
| args []string | ||
| expected []string | ||
| }{ | ||
| { | ||
| args: []string{"-Wp,-D_FORTIFY_SOURCE=2"}, | ||
| expected: []string{"-D_FORTIFY_SOURCE=2"}, | ||
| }, | ||
| { | ||
| args: []string{"-Wp,-DNDEBUG,-D_FORTIFY_SOURCE=2"}, | ||
| expected: []string{"-DNDEBUG", "-D_FORTIFY_SOURCE=2"}, | ||
| }, | ||
| } { | ||
| t.Run(fmt.Sprint(tc.args), func(t *testing.T) { | ||
| newArgs := processArgs(tc.args) | ||
| if !reflect.DeepEqual(newArgs, tc.expected) { | ||
| t.Fatalf("expected %#v, got %#v", tc.expected, newArgs) | ||
| } | ||
| }) | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| #! /usr/bin/env python3 | ||
| import os | ||
| import pathlib | ||
| import sys | ||
|
|
||
| def main(): | ||
| arg0 = pathlib.Path(sys.argv[0]).name | ||
| args = [] | ||
| for arg in sys.argv[1:]: | ||
| if arg.startswith("-Wp,-D"): | ||
| args.append(arg.replace("-Wp,-D", "-D", 1)) | ||
| else: | ||
| args.append(arg) | ||
|
|
||
| if arg0 == "zig-cc": | ||
| args = ["/mnt/zig", "cc", "-target", "s390x-linux-gnu.2.34"] + args | ||
| elif arg0 == "zig-c++": | ||
| args = ["/mnt/zig", "c++", "-target", "s390x-linux-gnu.2.34"] + args | ||
|
Comment on lines
+9
to
+18
Contributor
There was a problem hiding this comment. Fix Replacing - for arg in sys.argv[1:]:
- if arg.startswith("-Wp,-D"):
- args.append(arg.replace("-Wp,-D", "-D", 1))
- else:
- args.append(arg)
+ for arg in sys.argv[1:]:
+ if arg.startswith("-Wp,"):
+ args.extend(part for part in arg.split(",")[1:] if part)
+ else:
+ args.append(arg)🧰 Tools🪛 Ruff (0.14.4)16-16: Consider iterable unpacking instead of concatenation Replace with iterable unpacking (RUF005) 18-18: Consider iterable unpacking instead of concatenation Replace with iterable unpacking (RUF005) |
||
| else: | ||
| raise ValueError(f"Unknown argument {arg0}") | ||
|
|
||
| os.execve(args[0], args, os.environ) | ||
|
|
||
| if __name__ == "__main__": | ||
| sys.exit(main()) | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Restore
makefor non-ninja builds on s390x/ppc64leDropping
makehere leaves those arches without the classic build tool that many Python/C extensions still expect, sopip installof projects that callmakewill now fail. Please keepmakewhile addingninja-build.🤖 Prompt for AI Agents