Sync verified Native toolchain fixes for graphics Actions tests
This commit is contained in:
1 parent
3f7082d37d
commit
2694645d0d
3 files changed
+13
-2
No files matched your search
@@ -21,7 +21,7 @@ RUN rm -f /etc/apt/sources.list.d/debian.sources \
|
||||
pkg-config cmake binutils file unzip xz-utils bzip2 patch \
|
||||
libfontconfig1-dev libglib2.0-dev libgl1-mesa-dev libpci-dev \
|
||||
libx11-dev libxcb1-dev libxext-dev libwayland-dev libexpat1-dev libicu72 libssl3 \
|
||||
&& for tool in clang clang++ llvm-ar llvm-ranlib llvm-nm; do \
|
||||
&& for tool in clang clang++ llvm-ar llvm-ranlib llvm-nm lld ld.lld lld-link ld64.lld; do \
|
||||
ln -s "/usr/bin/$tool-16" "/usr/local/bin/$tool"; \
|
||||
done \
|
||||
&& mkdir -p /opt/staticlink \
|
||||
|
||||
@@ -20,6 +20,7 @@ def run(command):
|
||||
def main():
|
||||
parser = argparse.ArgumentParser(description=__doc__)
|
||||
parser.add_argument("--output", type=Path, required=True)
|
||||
parser.add_argument("--rids", default="[]")
|
||||
args = parser.parse_args()
|
||||
args.output.mkdir(parents=True, exist_ok=True)
|
||||
report = {"python": sys.version, "targets": {}, "passed": False}
|
||||
@@ -41,6 +42,11 @@ def main():
|
||||
raise RuntimeError("Missing .NET SDK " + major)
|
||||
adapter = Path(__file__).with_name("zig-cross.py")
|
||||
targets = runpy.run_path(str(adapter))["TARGETS"]
|
||||
requested = json.loads(args.rids)
|
||||
if not isinstance(requested, list) or any(rid not in targets for rid in requested):
|
||||
raise ValueError("Expected a JSON array of supported RIDs")
|
||||
if requested:
|
||||
targets = {rid: targets[rid] for rid in requested}
|
||||
sdk = Path("/opt/macos-sdk/MacOSX15.5.sdk")
|
||||
if json.loads((sdk / "SDKSettings.json").read_text())["Version"] != "15.5":
|
||||
raise RuntimeError("Unexpected macOS SDK version")
|
||||
|
||||
Reference in new issue
Block a user