From b6d6a49628241e7f3a36cc74ec13802b238b4bca Mon Sep 17 00:00:00 2001 From: Caleb Zulawski Date: Tue, 16 Dec 2025 16:31:29 -0500 Subject: [PATCH 1/2] Allow disabling libtool on macOS --- bazel/MODULE.bazel | 2 +- bazel/MODULE.bazel.lock | 6 +++--- bazel/detail/tools/BUILD | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bazel/MODULE.bazel b/bazel/MODULE.bazel index b2a36ed..a580e2d 100644 --- a/bazel/MODULE.bazel +++ b/bazel/MODULE.bazel @@ -3,7 +3,7 @@ module( version = "0.0.0", ) -bazel_dep(name = "rules_cc", version = "0.2.8") +bazel_dep(name = "rules_cc", version = "0.2.15") bazel_dep(name = "platforms", version = "1.0.0") bazel_dep(name = "bazel_skylib", version = "1.8.1") bazel_dep(name = "aspect_bazel_lib", version = "2.20.0") diff --git a/bazel/MODULE.bazel.lock b/bazel/MODULE.bazel.lock index 5cf4ef2..c4f99af 100644 --- a/bazel/MODULE.bazel.lock +++ b/bazel/MODULE.bazel.lock @@ -96,8 +96,8 @@ "https://bcr.bazel.build/modules/rules_cc/0.0.8/MODULE.bazel": "964c85c82cfeb6f3855e6a07054fdb159aced38e99a5eecf7bce9d53990afa3e", "https://bcr.bazel.build/modules/rules_cc/0.0.9/MODULE.bazel": "836e76439f354b89afe6a911a7adf59a6b2518fafb174483ad78a2a2fde7b1c5", "https://bcr.bazel.build/modules/rules_cc/0.1.1/MODULE.bazel": "2f0222a6f229f0bf44cd711dc13c858dad98c62d52bd51d8fc3a764a83125513", - "https://bcr.bazel.build/modules/rules_cc/0.2.8/MODULE.bazel": "f1df20f0bf22c28192a794f29b501ee2018fa37a3862a1a2132ae2940a23a642", - "https://bcr.bazel.build/modules/rules_cc/0.2.8/source.json": "85087982aca15f31307bd52698316b28faa31bd2c3095a41f456afec0131344c", + "https://bcr.bazel.build/modules/rules_cc/0.2.15/MODULE.bazel": "6a0a4a75a57aa6dc888300d848053a58c6b12a29f89d4304e1c41448514ec6e8", + "https://bcr.bazel.build/modules/rules_cc/0.2.15/source.json": "197965c6dcca5c98a9288f93849e2e1c69d622e71b0be8deb524e22d48c88e32", "https://bcr.bazel.build/modules/rules_foreign_cc/0.9.0/MODULE.bazel": "c9e8c682bf75b0e7c704166d79b599f93b72cfca5ad7477df596947891feeef6", "https://bcr.bazel.build/modules/rules_fuzzing/0.5.2/MODULE.bazel": "40c97d1144356f52905566c55811f13b299453a14ac7769dfba2ac38192337a8", "https://bcr.bazel.build/modules/rules_fuzzing/0.5.2/source.json": "c8b1e2c717646f1702290959a3302a178fb639d987ab61d548105019f11e527e", @@ -174,7 +174,7 @@ "moduleExtensions": { "@@apple_support+//crosstool:setup.bzl%apple_cc_configure_extension": { "general": { - "bzlTransitiveDigest": "p7Ghcq3+nnQxCrf+U3xnhdn7yOSTDbcFyGHK7Ja+rU4=", + "bzlTransitiveDigest": "JxuYb2AtfNO78yM+Q5Uk73ioaGhKHP5Al8qrOCfHYOY=", "usagesDigest": "aYRVMk+1OupIp+5hdBlpzT36qgd6ntgSxYTzMLW5K4U=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, diff --git a/bazel/detail/tools/BUILD b/bazel/detail/tools/BUILD index 41a24e2..db93716 100644 --- a/bazel/detail/tools/BUILD +++ b/bazel/detail/tools/BUILD @@ -6,7 +6,7 @@ load("//detail:host.bzl", "HOST_TARGET") alias( name = "tools", actual = select({ - "@platforms//os:macos": ":macos_tools", + "@rules_cc//cc/toolchains/args/archiver_flags:use_libtool_on_macos_setting": ":macos_libtool_tools", "//conditions:default": ":default_tools", }), visibility = ["//visibility:public"], @@ -29,7 +29,7 @@ cc_tool_map( ) cc_tool_map( - name = "macos_tools", + name = "macos_libtool_tools", tools = DEFAULT_TOOLS | { "@rules_cc//cc/toolchains/actions:ar_actions": ":llvm-libtool-darwin", }, From 5152c56b792804445fd490174c234f8d6486aa8a Mon Sep 17 00:00:00 2001 From: Caleb Zulawski Date: Tue, 16 Dec 2025 16:39:49 -0500 Subject: [PATCH 2/2] Update macOS runners --- .github/workflows/bazel.yml | 8 ++++---- .github/workflows/build-toolchain.yml | 4 ++-- .github/workflows/cmake.yml | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/bazel.yml b/.github/workflows/bazel.yml index 8c57042..ffa49e9 100644 --- a/.github/workflows/bazel.yml +++ b/.github/workflows/bazel.yml @@ -20,9 +20,9 @@ jobs: - name: aarch64-unknown-linux-gnu runs-on: ubuntu-24.04-arm - name: x86_64-apple-macos - runs-on: macos-13 + runs-on: macos-15-intel - name: arm64-apple-macos - runs-on: macos-14 + runs-on: macos-15 - name: x86_64-pc-windows-msvc runs-on: windows-2025 target: @@ -46,9 +46,9 @@ jobs: matrix: host: - name: x86_64-apple-macos - runs-on: macos-13 + runs-on: macos-15-intel - name: arm64-apple-macos - runs-on: macos-14 + runs-on: macos-15 target: - x86_64-apple-macos - arm64-apple-macos diff --git a/.github/workflows/build-toolchain.yml b/.github/workflows/build-toolchain.yml index cc059ec..58ec442 100644 --- a/.github/workflows/build-toolchain.yml +++ b/.github/workflows/build-toolchain.yml @@ -118,9 +118,9 @@ jobs: - name: aarch64-unknown-linux-gnu os: ubuntu-24.04-arm - name: x86_64-apple-macos - os: macos-13 + os: macos-15-intel - name: arm64-apple-macos - os: macos-14 + os: macos-15 - name: x86_64-pc-windows-msvc os: windows-2025 name: llvm ${{ matrix.target.name }} diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index ec66cd8..89028b6 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -20,9 +20,9 @@ jobs: - name: aarch64-unknown-linux-gnu runs-on: ubuntu-24.04-arm - name: x86_64-apple-macos - runs-on: macos-13 + runs-on: macos-15-intel - name: arm64-apple-macos - runs-on: macos-14 + runs-on: macos-15 - name: x86_64-pc-windows-msvc runs-on: windows-2025 target: @@ -46,9 +46,9 @@ jobs: matrix: host: - name: x86_64-apple-macos - runs-on: macos-13 + runs-on: macos-15-intel - name: arm64-apple-macos - runs-on: macos-14 + runs-on: macos-15 target: - x86_64-apple-macos - arm64-apple-macos