michaelkuc6/blog_os
1
0
Fork 0
mirror of https://github.com/phil-opp/blog_os.git synced 2025-12-16 14:27:49 +00:00
Code Issues Projects Releases Wiki Activity

No need to install LLD on travis/appveyor anymore

Browse Source 
Rust now ships a LLD binary.
This commit is contained in:
Philipp Oppermann
2018-03-06 09:31:12 +01:00
parent 4c909d5cfc
commit 033144fd9c
2 changed files with 1 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.appveyor.yml
View File

@@ -65,9 +65,7 @@ install:
build: false build: false
before_test: before_test:
- mkdir bin - set PATH=C:\msys64\mingw%MSYS_BITS%\bin;C:\msys64\usr\bin;%PATH%
- mklink "bin\ld.exe" "C:\Program Files\LLVM\bin\lld.exe"
- set PATH=%CD%\bin;C:\msys64\mingw%MSYS_BITS%\bin;C:\msys64\usr\bin;%PATH%
- rustup component add rust-src - rustup component add rust-src
- set RUST_BACKTRACE=1 - set RUST_BACKTRACE=1
- if not exist %USERPROFILE%\.cargo\bin\cargo-install-update.exe cargo install cargo-update - if not exist %USERPROFILE%\.cargo\bin\cargo-install-update.exe cargo install cargo-update

17
.travis.yml
View File

@@ -19,29 +19,12 @@ os:
- linux - linux
- osx - osx
addons:
apt:
sources:
- llvm-toolchain-trusty-5.0
packages:
- lld-5.0
cache: cache:
directories: directories:
- $HOME/.cargo - $HOME/.cargo
- $HOME/.xargo - $HOME/.xargo
- $TRAVIS_BUILD_DIR/target - $TRAVIS_BUILD_DIR/target
before_install:
- |
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
set -e
LLVM_URL="https://releases.llvm.org/5.0.1/clang+llvm-5.0.1-x86_64-apple-darwin.tar.xz"
travis_retry wget -O llvm.tar.xz -nv ${LLVM_URL}
tar -xJ -f llvm.tar.xz
export PATH="`pwd`/clang+llvm-5.0.1-final-x86_64-apple-darwin/bin:$PATH"
fi
before_script: before_script:
- rustup component add rust-src - rustup component add rust-src
- (test -x $HOME/.cargo/bin/cargo-install-update || cargo install cargo-update) - (test -x $HOME/.cargo/bin/cargo-install-update || cargo install cargo-update)