Skip to content

Commit

Permalink
Revert "Azure & Travis CI Linux: Temporarily revert to ld.gold as def…
Browse files Browse the repository at this point in the history
…ault linker"

This reverts commit 1d11882.
  • Loading branch information
kinke committed Oct 24, 2021
1 parent 8efd8bf commit 4397b85
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
4 changes: 1 addition & 3 deletions .azure-pipelines/1-posix-setup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,7 @@ steps:
tar -xf llvm.tar.xz --strip 1 -C llvm
# Non-Mac: make lld the default linker (possibly with enabled assertions unfortunately)
if [ "$CI_OS" != "osx" ]; then
#sudo ln -sf "$PWD/llvm/bin/ld.lld" /usr/bin/ld
# FIXME: https://github.com/ldc-developers/ldc/issues/3786
sudo ln -sf /usr/bin/ld.gold /usr/bin/ld
sudo ln -sf "$PWD/llvm/bin/ld.lld" /usr/bin/ld
fi
# Set PARALLEL_JOBS env variable and persist it for future steps
if [ "$CI_OS" = "osx" ]; then
Expand Down
4 changes: 1 addition & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,7 @@ install:
tar -xf llvm.tar.xz --strip 1 -C llvm || travis_terminate 1
rm llvm.tar.xz || travis_terminate 1
# Make lld the default linker (possibly with enabled assertions unfortunately)
#- sudo ln -sf "$PWD/llvm/bin/ld.lld" /usr/bin/ld
# FIXME: https://github.com/ldc-developers/ldc/issues/3786
- sudo ln -sf /usr/bin/ld.gold /usr/bin/ld
- sudo ln -sf "$PWD/llvm/bin/ld.lld" /usr/bin/ld

script:
- unset LD_LIBRARY_PATH
Expand Down

0 comments on commit 4397b85

Please sign in to comment.