Skip to content

Commit 9878b9f

Browse files
committed
fix(CI): lld needs to be installed on macOS
the host linker requires to be `lld`, as the `--enable-linker=ld64` option for `../configure` is only for specifying the target linker
1 parent 800747b commit 9878b9f

File tree

2 files changed

+1
-7
lines changed

2 files changed

+1
-7
lines changed

.github/workflows/test-and-publish.yaml

-7
Original file line numberDiff line numberDiff line change
@@ -88,13 +88,6 @@ jobs:
8888
if: ${{ matrix.os == 'macos-13' && steps.cache-spidermonkey.outputs.cache-hit != 'true' }}
8989
# SpiderMonkey requires XCode SDK version at least 13.3
9090
run: sudo xcode-select -switch /Applications/Xcode_14.3.app
91-
- name: Setup LLVM
92-
if: ${{ (matrix.os == 'macos-13' || matrix.os == 'macos-14') && steps.cache-spidermonkey.outputs.cache-hit != 'true' }}
93-
run: |
94-
brew install llvm@15
95-
ln -s $(brew --prefix llvm@15)/bin/lld /usr/local/bin/lld
96-
ln -s $(brew --prefix llvm@15)/bin/ld64.lld /usr/local/bin/ld64.lld
97-
ld64.lld --version
9891
- name: Build spidermonkey
9992
if: ${{ steps.cache-spidermonkey.outputs.cache-hit != 'true' }}
10093
run: ./setup.sh

setup.sh

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ if [[ "$OSTYPE" == "linux-gnu"* ]]; then # Linux
1818
elif [[ "$OSTYPE" == "darwin"* ]]; then # macOS
1919
brew update || true # allow failure
2020
brew install cmake pkg-config wget unzip coreutils # `coreutils` installs the `realpath` command
21+
brew install lld
2122
elif [[ "$OSTYPE" == "msys"* ]]; then # Windows
2223
echo "Dependencies are not going to be installed automatically on Windows."
2324
else

0 commit comments

Comments
 (0)