From f6016ab830a8a96f9d527bf9fe5399c219d576d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= Date: Wed, 20 Oct 2021 07:54:01 +0300 Subject: [PATCH] upgrade zig to 0.9.0-dev.1414+cde3dd365 --- README.md | 9 --------- ci/test | 16 ++++++++-------- toolchain/defs.bzl | 11 +++++------ 3 files changed, 13 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 6b25d78..f4ae6b2 100644 --- a/README.md +++ b/README.md @@ -88,15 +88,6 @@ when built with this toolchain, will not work on our target system. ## newer zig fails darwin tests -**Severity: no yet triaged** - -Task: not yet triaged. - -If zig is upgraded in this repository to nightly, it can't build the Darwin -executable. This section will be updated when more details are identified. - -## fcntl64 linking error on glibc < 2.28 - **Severity: Low** Task: [ziglang/zig #9485 glibc 2.27 or older: fcntl64 not found, but zig's glibc headers refer it](https://github.com/ziglang/zig/issues/9485) diff --git a/ci/test b/ci/test index 9e119d9..91c83f4 100755 --- a/ci/test +++ b/ci/test @@ -32,6 +32,14 @@ _test() { _test "Host" \ "ELF 64-bit.* x86-64.* dynamically linked" +_test "darwin_amd64" \ + "Mach-O 64-bit x86_64 executable" \ + --platforms @io_bazel_rules_go//go/toolchain:darwin_amd64_cgo + +_test "darwin_arm64" \ + "Mach-O 64-bit arm64 executable" \ + --platforms @io_bazel_rules_go//go/toolchain:darwin_arm64_cgo + _test "linux_amd64_gnu" \ "ELF 64-bit.* x86-64.* dynamically linked" \ --platforms @io_bazel_rules_go//go/toolchain:linux_amd64_cgo @@ -49,11 +57,3 @@ _test "linux_arm64_musl" \ "ELF 64-bit.* ARM aarch64.* statically linked" \ --platforms @io_bazel_rules_go//go/toolchain:linux_arm64_cgo \ --extra_toolchains @zig_sdk//:linux_arm64_musl_toolchain - -_test "darwin_amd64" \ - "Mach-O 64-bit x86_64 executable" \ - --platforms @io_bazel_rules_go//go/toolchain:darwin_amd64_cgo - -_test "darwin_arm64" \ - "Mach-O 64-bit arm64 executable" \ - --platforms @io_bazel_rules_go//go/toolchain:darwin_arm64_cgo diff --git a/toolchain/defs.bzl b/toolchain/defs.bzl index 6a23985..46fe4bc 100644 --- a/toolchain/defs.bzl +++ b/toolchain/defs.bzl @@ -152,18 +152,17 @@ def register_toolchains( zig_repository( name = "zig_sdk", # Pre-release: - #version = "0.9.0-dev.953+211856693", # fails on darwin-x86_64 - version = "0.9.0-dev.727+aad459836", + version = "0.9.0-dev.1414+cde3dd365", url_format = "https://dl.jakstys.lt/zig/zig-{host_platform}-{version}.tar.xz", #url_format = "https://ziglang.org/builds/zig-{host_platform}-{version}.tar.xz", # Release: #version = "0.8.1", #url_format = "https://ziglang.org/download/{version}/zig-{host_platform}-{version}.tar.xz", host_platform_sha256 = { - "linux-aarch64": "bdf83d43a227ce7943591d358aca36f472dcc135ea2a1cd84f83b461b87a7d33", - "linux-x86_64": "1a0f45e77e2323d4afb3405868c0d96a88170a922eb60fc06f233ac8395fbfd5", - "macos-aarch64": "3d56133a0b5b6d3f415e344d5949bff37d5793228a0a98eea6d63eaf64fd08fe", - "macos-x86_64": "cdc76afd3e361c8e217e4d56f2027ec6482d7f612462c27794149b7ad31b9244", + "linux-aarch64": "d910c838fa4c7b535e924e39726bbd2ff4811cd88d7cd64b087a7c12d3c37dc8", + "linux-x86_64": "8b55b538278c9be63ecaeb164b3097c542e410d8d3fee7aac1a51080fa04e64c", + "macos-aarch64": "aa14e2348bb22fbe75ca14d5b1eee5301f88dbbde5eccca2b750d4747f9033bc", + "macos-x86_64": "038d9ad0d2f76dfeb44d3a05679620e9b49bc93e4250d856238f79edea03dff6", }, host_platform_include_root = { "linux-aarch64": "lib/",