Add wrapper scripts for Zig cross-compilation and adjust s390x sandbox configuration

Author: jiridanek

Makefile

@@ -496,8 +496,14 @@ bin/zig-$(ZIG_VERSION):
 	TMPDIR=$(shell mktemp -d)
 	wget --progress=dot:giga https://ziglang.org/download/$(ZIG_VERSION)/zig-$(ARCH)-linux-$(ZIG_VERSION).tar.xz
 	tar -xJf zig-$(ARCH)-linux-$(ZIG_VERSION).tar.xz -C $$TMPDIR --strip-components=1
-	mv $$TMPDIR bin/zig-$(ZIG_VERSION)
 	rm -rf zig-$(ARCH)-linux-$(ZIG_VERSION).tar.xz
+
+	printf '%s\n' '#!/bin/sh' 'exec /mnt/zig cc -target s390x-linux-gnu.2.34 "$@"' > $$TMPDIR/zig-cc
+	printf '%s\n' '#!/bin/sh' 'exec /mnt/zig c++ -target s390x-linux-gnu.2.34 "$@"' > $$TMPDIR/zig-c++
+	chmod +x $$TMPDIR/zig-cc
+	chmod +x $$TMPDIR/zig-c++
+
+	mv $$TMPDIR bin/zig-$(ZIG_VERSION)
 	@echo "Zig installed as bin/zig-$(ZIG_VERSION)"
 
 # This should be .PHONY because it's an alias/action

scripts/sandbox.py

@@ -51,8 +51,15 @@ def main() -> int:
         target = "s390x-linux-gnu.2.34"
         additional_arguments = [
             f"--volume={os.getcwd()}/bin/zig-0.15.1:/mnt",
-            f"--env=CC=/mnt/zig cc -target {target}",
-            f"--env=CXX=/mnt/zig c++ -target {target}",
+            # f"--env=CC=/mnt/zig cc -target {target}",
+            # f"--env=CXX=/mnt/zig c++ -target {target}",
+            # f"--env=CC=/mnt/zig-cc",
+            # f"--env=CXX=/mnt/zig-c++",
+            # -Wp,-D_FORTIFY_SOURCE=2
+            # https://github.com/giampaolo/psutil/blob/master/setup.py#L254
+            # defaults to using python's flags
+            # f"--env=CFLAGS=",
+            "--env=CXXFLAGS=-Dundefined=64",
             f"--unsetenv=CC",
             f"--unsetenv=CXX",
             tmpdir,

wrapper.py

@@ -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
+    else:
+        raise ValueError(f"Unknown argument {arg0}")
+
+    os.execve(args[0], args, os.environ)
+
+if __name__ == "__main__":
+    sys.exit(main())