Skip to content

Commit 771c7e2

Browse files
committed
[macOS tweaks]
1 parent c922a5f commit 771c7e2

File tree

2 files changed

+25
-2
lines changed

2 files changed

+25
-2
lines changed

.github/actions/1-setup/action.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,29 @@ runs:
3535
sudo ln -sf ld.lld-21 /usr/bin/ld
3636
ld --version
3737
38+
- name: 'macOS: Install Homebrew clang 21'
39+
if: runner.os == 'macOS'
40+
shell: bash
41+
run: |
42+
set -eux
43+
brew install llvm@21
44+
45+
# use it as C(++) compiler for future steps
46+
if [[ '${{ inputs.arch }}' == arm64 ]]; then
47+
echo "CC=/opt/homebrew/opt/llvm/bin/clang" >> $GITHUB_ENV
48+
echo "CXX=/opt/homebrew/opt/llvm/bin/clang++" >> $GITHUB_ENV
49+
else
50+
echo "CC=/usr/local/opt/llvm/bin/clang" >> $GITHUB_ENV
51+
echo "CXX=/usr/local/opt/llvm/bin/clang++" >> $GITHUB_ENV
52+
fi
53+
54+
# https://github.com/actions/runner-images/issues/10035#issue-2344536514
55+
sudo xcode-select -s /Library/Developer/CommandLineTools
56+
xcrun --show-sdk-path
57+
58+
# https://github.com/llvm/llvm-project/issues/155531#issuecomment-3229499205
59+
rm -rf "$(dirname $CC)/../include/c++/v1"
60+
3861
- name: 'Windows: Install clang 21 from GitHub'
3962
if: runner.os == 'Windows'
4063
shell: bash

.github/workflows/ldc-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,11 @@ jobs:
7676
arch: arm64
7777
with_asserts: true
7878
- job_name: macOS x86_64
79-
os: macos-13
79+
os: macos-15-intel
8080
arch: x86_64
8181
with_asserts: false
8282
- job_name: macOS x86_64 withAsserts
83-
os: macos-13
83+
os: macos-15-intel
8484
arch: x86_64
8585
with_asserts: true
8686
name: ${{ matrix.job_name }}

0 commit comments

Comments
 (0)