Skip to content

Commit 769f317

Browse files
committed
remove lld
1 parent 0ad6682 commit 769f317

File tree

2 files changed

+0
-17
lines changed

2 files changed

+0
-17
lines changed

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

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -88,15 +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-
ln -s $(brew --prefix llvm@15)/bin/llvm-install-name-tool /usr/local/bin/llvm-install-name-tool
98-
ld64.lld --version
99-
llvm-install-name-tool --version
10091
- name: Build spidermonkey
10192
if: ${{ steps.cache-spidermonkey.outputs.cache-hit != 'true' }}
10293
run: ./setup.sh
@@ -177,13 +168,6 @@ jobs:
177168
echo "Installed Dependencies"
178169
env:
179170
PYTHON_VERSION: ${{ matrix.python_version }}
180-
- name: Setup LLVM
181-
if: ${{ matrix.os == 'macos-13' || matrix.os == 'macos-14' }}
182-
run: |
183-
brew install llvm@15
184-
ln -s $(brew --prefix llvm@15)/bin/lld /usr/local/bin/lld
185-
ln -s $(brew --prefix llvm@15)/bin/ld64.lld /usr/local/bin/ld64.lld
186-
ld64.lld --version
187171
- name: Build Docs # only build docs once
188172
if: ${{ matrix.os == 'ubuntu-20.04' && matrix.python_version == '3.11' }}
189173
run: |

CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
9191
set(PYTHONLIBS_VERSION_STRING ${Python_VERSION})
9292
set(PYTHON_INCLUDE_DIR ${Python_INCLUDE_DIRS})
9393
set(PYTHON_LIBRARIES ${Python_LIBRARIES})
94-
set(CMAKE_LINKER_TYPE "LLD")
9594
elseif(UNIX)
9695
find_package(Python 3.8 COMPONENTS Interpreter Development REQUIRED)
9796
set(Python_FIND_VIRTUALENV FIRST) # (require cmake >= v3.15 and this is the default) use the Python version configured by pyenv if available

0 commit comments

Comments
 (0)