Skip to content

Allow disabling libtool on macOS #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
calebzulawski merged 2 commits into from
Dec 16, 2025
Merged

Allow disabling libtool on macOS #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6d6a49
Allow disabling libtool on macOS
calebzulawski Dec 16, 2025
5152c56
Update macOS runners
calebzulawski Dec 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/bazel.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-toolchain.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/cmake.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion bazel/MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
6 changes: 3 additions & 3 deletions bazel/MODULE.bazel.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions bazel/detail/tools/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand All @@ -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",
},
Expand Down